diff options
Diffstat (limited to 'jjb/apex')
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index fc1e734e5..9cccf6dcd 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -360,7 +360,7 @@ elif [[ "$features" =~ 'rocky' ]]; then echo "DOCKER_TAG=hunter" > functest_tag else - touch functest_tag + echo "DOCKER_TAG=''" > functest_tag fi - inject: properties-file: functest_tag @@ -373,7 +373,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - DOCKER_TAG=$DOCKER_TAG + DOCKER_TAG="" FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index fb0dae121..33aec192e 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -586,6 +586,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO + DOCKER_TAG='' fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: @@ -641,6 +642,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 @@ -669,6 +674,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 4d77f4a39..281a09bf2 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -432,6 +432,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO + DOCKER_TAG='' fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: @@ -487,6 +488,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 @@ -515,6 +520,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false |