Merge "Geode: Revert build slave back to Ubuntu 18.04"

[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 48249d8498d50fb3f94171e4d5f0327a16d1b4ff..abcb532872345d00941d995d7b96beffdb834e64 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.10.0':
-          branch: 'release-nordix/1.10.0'
+      - 'release-nordix-1.14.0':
+          branch: 'release-nordix/1.14.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,6 +142,7 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
+              enable-condition: "$PUBLISH_GEODE == true"
 
     publishers:
       - notify-slack:
@@ -137,4 +150,4 @@
           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