From c393f522640d789317fb5ba16e646071793a5bf3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 21 Oct 2018 10:46:54 +0200 Subject: Revert "Select the right Functest repos when master" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 751002f537007f35a536959e4180ce7c48e18bf1. Change-Id: I4c7cef7f4296686fda70011e9bf840b114f11845 Signed-off-by: Cédric Ollivier --- jjb/apex/apex.yaml.j2 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'jjb/apex/apex.yaml.j2') diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 455f198f1..bd8e98abf 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' -- cgit 1.2.3-korg