INFRA: Switch to tox for JJB verify and merge jobs

[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 ca0668c04e05cee028ee0ad09482922cc96cae57..9b19b205afbef3d7b72a128849b317ac57508291 100644 (file)
--- a/jjb/geode-native/apache-geode-native-verify.yaml
+++ b/jjb/geode-native/apache-geode-native-verify.yaml
@@ -22,8 +22,8 @@
     project: 'Nordix/geode-native'
 
     stream:
-      - 'develop':
-          branch: 'develop'
+      - 'release-nordix-1.10.0':
+          branch: 'release-nordix/1.10.0'
     jobs:
       - 'apache-geode-native-{stream}-verify'
 
@@ -43,9 +43,13 @@
           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: '6'
+          default: '24'
           description: JJB configured JOBS parameter. Specifies the number of make jobs to run simultaneously while building geode-native
       - string:
           name: GEODE_NATIVE_DOCKER_IMAGE
@@ -63,7 +67,7 @@
 
     scm:
       - git-scm-github:
-          branch: '{branch}'
+          branch: '$BRANCH'
           refspec: ''
           wipe_workspace: true
           clean_before: false
@@ -73,6 +77,7 @@
       - github
 
     builders:
+      - 'verify-geode-tag-macro'
       - multijob:
           name: SlaveSetup
           condition: SUCCESSFUL
@@ -108,21 +113,22 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
-#      - multijob:
-#          name: Release
-#          condition: SUCCESSFUL
-#          execution-type: SEQUENTIALLY
-#          projects:
-#            - name: 'apache-geode-native-SrcRelease'
-#              current-parameters: true
-#              git-revision: true
-#              abort-all-job: true
-#              node-parameters: true
+      - multijob:
+          name: Release
+          condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
+          projects:
+            - name: 'apache-geode-native-SrcRelease'
+              current-parameters: true
+              git-revision: true
+              abort-all-job: true
+              node-parameters: true
+              enable-condition: "$PUBLISH_GEODE == true"
 
-#    publishers:
-#      - notify-slack:
-#          slack-channel: '#geode'
-#          notify-start: true
-#          notify-success: true
-#          notify-failure: true
-#          notify-back-to-normal: true
\ No newline at end of file
+    publishers:
+      - notify-slack:
+          slack-channel: '#geode-ci'
+          notify-start: true
+          notify-success: true
+          notify-failure: true
+          notify-back-to-normal: true
\ No newline at end of file