Apex: add missing builders path to trigger

[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 854aefc..c10a783 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -173,6 +173,8 @@
                   pattern: 'config/**'
                 - compare-type: ANT
                   pattern: 'apex/build/**'
+                - compare-type: ANT
+                  pattern: 'apex/builders/**'
                 - compare-type: ANT
                   pattern: 'apex/common/**'
                 - compare-type: ANT
@@ -354,13 +356,17 @@
               abort-all-job: true
               git-revision: true
       - shell: |
-          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
-          echo 'REPO=opnfv' > functest_repo
+          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 'REPO=ollivier' > functest_repo
+            echo "DOCKER_TAG=''" > functest_tag
           fi
       - inject:
-          properties-file: functest_repo
+          properties-file: functest_tag
+          override-build-parameters: true
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -369,9 +375,9 @@
               current-parameters: false
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
                 FUNCTEST_SUITE_NAME=tempest_smoke
                 FUNCTEST_MODE=testcase
-                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER