diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-30 17:03:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-30 17:03:45 +0000 |
| commit | a7108b14b43f951da3cb1bb3d6ea5305642ba9ee (patch) | |
| tree | a7465f1807e78b81cff7e5fce57d1f81330fdd1a | |
| parent | d2b0f38a91aecd4259a3b060553d1429ec5babe3 (diff) | |
| parent | 34d72eb1a6e276473953099359605cc555a7bcf7 (diff) | |
Merge "Write the right default values in DOCKER_TAG"
| -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: |