Write the right default values in DOCKER_TAG

[releng.git] / jjb / apex / apex.yaml

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 7a9106e..8fd976a 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -586,7 +586,8 @@
             echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
-            echo "DOCKER_TAG=''" > functest_scenario
+            echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
+              echo "latest" || echo ${BRANCH##*/})" > functest_scenario
           fi
           echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:
@@ -672,7 +673,7 @@
             - 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