X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-verify-jobs.yaml;h=a61d9fdab63d3d8ee0a1b87999c4974ea990e53d;hb=465489485b2ff37cf6822b0c6431cf0111db2210;hp=854aefc7f78e79337db53495bdacac77d28a9440;hpb=6a2f75928ca54b0566ac116ec608cd4a37c23227;p=releng.git

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 854aefc7f..a61d9fdab 100644
--- 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
@@ -353,14 +355,11 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      - shell: |
-          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
-          echo 'REPO=opnfv' > functest_repo
-          else
-          echo 'REPO=ollivier' > functest_repo
-          fi
+      - shell:
+          !include-raw-escape: ./apex-functest-scenario.sh
       - inject:
-          properties-file: functest_repo
+          properties-file: functest_tag
+          override-build-parameters: true
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -369,9 +368,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