Use the 'test' job on the 'develop' branch only

cloudfoundry-community · Dec 4, 2024 · 4d90144 · 4d90144
1 parent fd99abf
commit 4d90144
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/ci/release_notes.md b/ci/release_notes.md
@@ -0,0 +1,3 @@
+### Improvements
+
+- What's up, doc?
diff --git a/ci/settings.yml b/ci/settings.yml
@@ -40,6 +40,7 @@ meta:
   github:
     owner:          cloudfoundry-community
     repo:           slack-notification-resource
+    # branch:         master
     pr_base_branch: develop
     private_key:    ((github-private-key))
     access_token:   ((github-access-token))
@@ -54,7 +55,7 @@ groups:
   - name: (( grab meta.name ))
     jobs:
       - (( append ))
-      - test
+      - test-develop
 
 jobs:
   - name: build
@@ -89,13 +90,13 @@ jobs:
         params:
           IMAGE_ARG_alpine: alpine-latest/image.tar
 
-  - name: test
+  - name: test-develop
     public: true
     serial: true
     plan:
       - in_parallel:
           - { get: edge, passed: [ build ], trigger: true }
-          - { get: git,  passed: [ build ], trigger: true }
+          - { get: git,  resource: develop, trigger: true }
       - task: test-image
         image: edge
         config:
@@ -107,10 +108,10 @@ jobs:
             args:
               - -c
               - |
-                set -ueo pipefail -x
-
                 bash --version | head -n 1
+                set -ueo pipefail -x
 
+                rm -f /opt/resource/{check,in,out}
                 git/test/all.sh
 
         on_failure:
@@ -122,14 +123,6 @@ jobs:
             icon_url: (( grab meta.slack.icon ))
             text:     (( grab meta.slack.fail_text ))
 
-  - name: rc
-    plan:
-      - (( inline ))
-      - in_parallel:
-          - (( merge on get ))
-          - { get: edge, passed: [ (( replace )), test ] }
-          - { get: git,  passed: [ (( replace )), test ] }
-
   - name: promote
     plan:
       - (( insert after 1 )) # insert after “task: release”
@@ -163,6 +156,15 @@ jobs:
 
 resources:
 
+  - name: develop
+    type: git
+    icon: github
+    source:
+      uri:         (( grab meta.github.uri ))
+      branch:      (( grab meta.github.pr_base_branch ))
+      private_key: (( grab meta.github.private_key ))
+    webhook_token: ((gk-concourse-webhook-token))
+
   - name: git
     check_every: 24h
     webhook_token: ((gk-concourse-webhook-token))