diff options
| -rw-r--r-- | jjb/apex/apex.yaml | 13 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index d019fbeeb..2e615b346 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -545,6 +545,19 @@ 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" == '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') + else + functest_scenario=$DEPLOY_SCENARIO + fi + echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + - inject: + properties-file: functest_scenario + override-build-parameters: true - multijob: name: 'OPNFV Test Suite' condition: ALWAYS diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index aeefb5d83..e23718e99 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -415,6 +415,19 @@ 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" == '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') + else + functest_scenario=$DEPLOY_SCENARIO + fi + echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + - inject: + properties-file: functest_scenario + override-build-parameters: true - multijob: name: 'OPNFV Test Suite' condition: ALWAYS |