diff options
Diffstat (limited to 'jjb/apex')
| -rw-r--r-- | jjb/apex/apex.yaml | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 3d72a363c..708b44503 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -577,11 +577,6 @@ abort-all-job: true git-revision: false - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi 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') @@ -590,9 +585,9 @@ else functest_scenario=$DEPLOY_SCENARIO fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 33e135c0c..85ebbdf23 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -423,11 +423,6 @@ abort-all-job: true git-revision: false - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi 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') @@ -436,9 +431,9 @@ else functest_scenario=$DEPLOY_SCENARIO fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' |