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.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.yaml')
| -rw-r--r-- | jjb/apex/apex.yaml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index aa9ec2c81..564417c23 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -578,14 +578,16 @@ git-revision: false - shell: | features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') + if [ "$features" == 'rocky' ]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p') + echo "DOCKER_TAG=hunter" > functest_scenario + elif [[ "$features" =~ 'rocky' ]]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p') + echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO fi - echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: properties-file: functest_scenario override-build-parameters: true @@ -596,8 +598,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false |