X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=8fd976ad166d91b620fdbe366c698810a40133bd;hb=34d72eb1a6e276473953099359605cc555a7bcf7;hp=fb0dae12103d22eb54d8f98451a75d1ae72d11b8;hpb=8b2992ceae90811d0c8f33dd9272aaa215197732;p=releng.git

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index fb0dae121..8fd976ad1 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -586,6 +586,8 @@
             echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
+            echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
+              echo "latest" || echo ${BRANCH##*/})" > functest_scenario
           fi
           echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:
@@ -641,6 +643,10 @@
           name: DEPLOY_SCENARIO
           default: '{scenario}'
           description: "Scenario to deploy with."
+      - string:
+          name: DOCKER_TAG
+          default: ''
+          description: Default docker tag to pass to functest
 
     properties:
       - logrotate-default
@@ -667,8 +673,9 @@
             - name: 'functest-apex-baremetal-daily-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
               abort-all-job: false
               git-revision: false