diff options
| -rw-r--r-- | jjb/apex/apex.yaml | 3 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 454c69057..8fd976ad1 100644 --- 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: diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index daf2ce8b7..b2deb7313 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -432,7 +432,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: |