diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-23 16:18:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-23 16:18:28 +0000 |
| commit | d5cce0e2a7d4d75c8c056651ab5f2a36454a8145 (patch) | |
| tree | 4f92e468be615215df386449de7b157da138f1b5 /jjb/apex/apex.yaml.j2 | |
| parent | e9ec3628d0dc308be594eebe8df5aeafdf5dded5 (diff) | |
| parent | fddd2ca91a0659946aeecaa0922d292b8e1f1734 (diff) | |
Merge "Run Functest hunter containers if Apex Rocky"
Diffstat (limited to 'jjb/apex/apex.yaml.j2')
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 85ebbdf23..b85356e67 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -424,14 +424,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 @@ -442,8 +444,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 |