diff options
Diffstat (limited to 'jjb/apex/apex.yaml')
| -rw-r--r-- | jjb/apex/apex.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 8fd976ad1..331158972 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -576,20 +576,8 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - shell: | - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/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 - echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ - echo "latest" || echo ${BRANCH##*/})" > functest_scenario - fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: properties-file: functest_scenario override-build-parameters: true |