Apex: Fix injecting functest vars

[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 805fb72..23ce14f 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
@@ -353,6 +355,11 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
+      - shell:
+          !include-raw-escape: ./apex-functest-scenario.sh
+      - inject:
+          properties-file: functest_scenario
+          override-build-parameters: true
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -361,6 +368,7 @@
               current-parameters: false
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
                 FUNCTEST_SUITE_NAME=tempest_smoke
                 FUNCTEST_MODE=testcase
                 GERRIT_BRANCH=$GERRIT_BRANCH