Apex: Update build jobs with hunter stream

[releng.git] / jjb / apex / apex-verify-jobs.yaml

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 15e6826..e8115eb 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -12,6 +12,11 @@
           gs-pathname: ''
           verify-scenario: 'os-nosdn-nofeature-noha'
           disabled: false
+      - hunter: &hunter
+          branch: '{stream}'
+          gs-pathname: ''
+          verify-scenario: 'os-nosdn-nofeature-noha'
+          disabled: false
       - gambia: &gambia
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
@@ -173,6 +178,8 @@
                   pattern: 'config/**'
                 - compare-type: ANT
                   pattern: 'apex/build/**'
+                - compare-type: ANT
+                  pattern: 'apex/builders/**'
                 - compare-type: ANT
                   pattern: 'apex/common/**'
                 - compare-type: ANT
@@ -353,17 +360,10 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      - shell: |
-          features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
-          if [ "$features" == 'rocky' ]; then
-            echo "DOCKER_TAG=hunter" > functest_tag
-          elif [[ "$features" =~ 'rocky' ]]; then
-            echo "DOCKER_TAG=hunter" > functest_tag
-          else
-            echo "DOCKER_TAG=''" > functest_tag
-          fi
+      - shell:
+          !include-raw-escape: ./apex-functest-scenario.sh
       - inject:
-          properties-file: functest_tag
+          properties-file: functest_scenario
           override-build-parameters: true
       - multijob:
           name: functest-smoke