INFRA: Switch to tox for JJB verify and merge jobs

[infra/cicd.git] / jjb / geode / apache-geode-test-coordinator.yaml

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index d1366d4b28dda64cd0057a70764b18861aecffa8..bd8cc5991f095112be5871db93a85ffaacb68f1e 100644 (file)
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -22,8 +22,8 @@
     project: 'Nordix/geode'
 
     stream:
-      - 'release-nordix-1.9.0':
-          branch: 'release-nordix/1.9.0'
+      - 'release-nordix-1.13.0':
+          branch: 'release-nordix/1.13.0'
     jobs:
       - 'apache-geode-verify-{stream}-coordinator'
 
@@ -43,6 +43,10 @@
           name: BRANCH
           default: '{branch}'
           description: JJB configured BRANCH parameter for Nordix GitHub project
+      - bool:
+          name: PUBLISH_GEODE
+          default: true
+          description: Publish Geode software to Nordix Artifactory after all tests are passed
 
     properties:
       - logrotate
@@ -59,7 +63,7 @@
 
     scm:
       - git-scm-github:
-          branch: '{branch}'
+          branch: '$BRANCH'
           refspec: ''
           wipe_workspace: true
           clean_before: false
@@ -95,6 +99,14 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
+# Disable ApiCheck job as the ApiCheckTest was introduced
+# in Geode 1.13 and it doesn't exist in geode 1.12
+#            - name: 'apache-geode-ApiCheckTest-jdk11'
+#              current-parameters: true
+#              git-revision: true
+#              disabled: true
+#              abort-all-job: true
+#              node-parameters: true
             - name: 'apache-geode-StressNewTest-jdk11'
               current-parameters: true
               git-revision: true
@@ -130,11 +142,12 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
+              enable-condition: "$PUBLISH_GEODE == true"
 
     publishers:
       - notify-slack:
-          slack-channel: '#geode'
+          slack-channel: '#geode-ci'
           notify-start: true
           notify-success: true
           notify-failure: true
-          notify-back-to-normal: true
\ No newline at end of file
+          notify-back-to-normal: true