diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-22 12:12:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-22 12:12:51 +0000 |
| commit | 2522d0760f5f48803ddd31b3f8a9b98ef3c2d36c (patch) | |
| tree | d49b48838c0c08a2664e2ceaa9c741813b413910 /jjb/apex/apex.yaml.j2 | |
| parent | d478df6bf4a1581f40daecf851006938d5e54905 (diff) | |
| parent | c393f522640d789317fb5ba16e646071793a5bf3 (diff) | |
Merge "Revert "Select the right Functest repos when master""
Diffstat (limited to 'jjb/apex/apex.yaml.j2')
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 9 |
1 files changed, 2 insertions, 7 deletions
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' |