Merge "Update plots: Clean up k6 test suite"

[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 c955bb75fd3074158f4b19249d2457be5cdc2ad0..f93ab003de874fddc3139b3945f79defa89c2b6f 100644 (file)
--- 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.12.0':
-          branch: 'release-nordix/1.12.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
 
@@ -47,6 +51,10 @@
           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
@@ -99,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