X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fgeode%2Fapache-geode-test-coordinator.yaml;h=f93ab003de874fddc3139b3945f79defa89c2b6f;hb=HEAD;hp=48249d8498d50fb3f94171e4d5f0327a16d1b4ff;hpb=cfdc0dea36ea8bdcebd350fbe1953fab4b9c110d;p=infra%2Fcicd.git

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index 48249d84..f93ab003 100644
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -22,15 +22,19 @@
     project: 'Nordix/geode'
 
     stream:
-      - 'release-nordix-1.10.0':
-          branch: 'release-nordix/1.10.0'
+      - 'release-nordix-1.15.1':
+          branch: 'release-nordix/1.15.1'
+          test_using_docker: false
+      - 'release-nordix-1.14.0':
+          branch: 'release-nordix/1.14.0'
+          test_using_docker: true
     jobs:
       - 'apache-geode-verify-{stream}-coordinator'
 
 - job-template:
     name: 'apache-geode-verify-{stream}-coordinator'
     project-type: multijob
-    disabled: false
+    disabled: true
     concurrent: true
     node: geode-ubuntu1804
 
@@ -43,6 +47,14 @@
           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
+      - bool:
+          name: TEST_USING_DOCKER
+          default: '{test_using_docker}'
+          description: Geode versions prior to 1.15 were using a docker for executing parallel testing. Please set it to 'no' when building version 1.15 onwards.
 
     properties:
       - logrotate
@@ -59,7 +71,7 @@
 
     scm:
       - git-scm-github:
-          branch: '{branch}'
+          branch: '$BRANCH'
           refspec: ''
           wipe_workspace: true
           clean_before: false
@@ -95,6 +107,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 +150,7 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
+              enable-condition: "$PUBLISH_GEODE == true"
 
     publishers:
       - notify-slack:
@@ -137,4 +158,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