X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fgeode%2Fapache-geode-test-coordinator.yaml;h=f17219638a6085f587e1c133c068142816c6109d;hb=e787e9a366b94baae77457179f7d00a85442eb0c;hp=87d7313b2fb763782384cafbde11822a189f5400;hpb=c8dcf1c591156a27f450e52dbfc039c5ab4849aa;p=infra%2Fcicd.git

diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index 87d7313b..f1721963 100644
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -22,8 +22,12 @@
     project: 'Nordix/geode'
 
     stream:
-      - 'release-nordix-1.9.0':
-          branch: 'release-nordix/1.9.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'
 
@@ -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
@@ -69,6 +81,7 @@
       - github
 
     builders:
+      - 'verify-geode-tag-macro'
       - multijob:
           name: SlaveSetup
           condition: SUCCESSFUL
@@ -94,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
@@ -124,16 +145,17 @@
           condition: SUCCESSFUL
           execution-type: SEQUENTIALLY
           projects:
-            - name: 'apache-geode-build-jdk8'
+            - name: 'apache-geode-build-release-jdk8'
               current-parameters: true
               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