diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-21 11:30:25 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-23 15:18:59 +0200 |
| commit | fddd2ca91a0659946aeecaa0922d292b8e1f1734 (patch) | |
| tree | c6b8f5b914eb56d4d39c855f3ff4ec7d876284eb /jjb/apex/apex-verify-jobs.yaml | |
| parent | 9a9e8d971c98f6ca94223c05070f1ad97f7ed50f (diff) | |
Run Functest hunter containers if Apex Rocky
It replaces Queens logics as it should be useless since new gambia
jjbs have been created.
From the time being, Apex jjbs run master containers which should
work thanks to backward compatibility but vnfs are falsy skipped.
[1].
It updates verify-jobs to run the right container (hunter in case of
rocky).
[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/373/console
Change-Id: I0df483eb78092e8155dd288d3c86d10b7762e433
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/apex/apex-verify-jobs.yaml')
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 805fb7246..fb52fa1d9 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -353,6 +353,16 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') + if [ "$features" == 'rocky' ]; then + echo "DOCKER_TAG=hunter" > functest_tag + elif [[ "$features" =~ 'rocky' ]]; then + echo "DOCKER_TAG=hunter" > functest_tag + fi + - inject: + properties-file: functest_tag + override-build-parameters: true - multijob: name: functest-smoke condition: ALWAYS @@ -361,6 +371,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase GERRIT_BRANCH=$GERRIT_BRANCH |