Merge "Parameterize DISTRIBUTION and merge job templates"

[infra/cicd.git] / jjb / geode-native / apache-geode-native-verify.yaml

diff --git a/jjb/geode-native/apache-geode-native-verify.yaml b/jjb/geode-native/apache-geode-native-verify.yaml
index 2d085f2c75aa604da5bcbae1ffca5e3cd0761ace..384e1285d674e2b3255d72270ed0afebe8248b2a 100644 (file)
--- a/jjb/geode-native/apache-geode-native-verify.yaml
+++ b/jjb/geode-native/apache-geode-native-verify.yaml
@@ -32,7 +32,7 @@
     project-type: multijob
     disabled: false
     concurrent: true
-    node: geode-ubuntu1804
+    node: geode-ubuntu2004
 
     parameters:
       - string:
@@ -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
       - string:
           name: JOBS
           default: '24'
@@ -63,7 +67,7 @@
 
     scm:
       - git-scm-github:
-          branch: '{branch}'
+          branch: '$BRANCH'
           refspec: ''
           wipe_workspace: true
           clean_before: false
@@ -119,10 +123,11 @@
               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