From 01b6e24790816cb0dbe62c3af4551d33bab2dda8 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 23 Jul 2018 12:39:10 -0400 Subject: Apex: Correct functest container with snapshot If OS_VERSION is master we want to pull ollivier containers, otherwise we can pull OPNFV. Change-Id: I6e838a85c6b7918540c8bc3ca2d5e790e5aa7a57 Signed-off-by: Tim Rozet --- jjb/3rd_party_ci/odl-netvirt.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 367568ae1..4453ee250 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -163,6 +163,14 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: false + - shell: | + if echo $OS_VERSION | grep queens &> /dev/null; then + echo 'REPO=opnfv' > functest_repo + else + echo 'REPO=ollivier' > functest_repo + fi + - inject: + properties-file: functest_repo - multijob: name: functest condition: SUCCESSFUL @@ -173,6 +181,7 @@ FUNCTEST_MODE=testcase FUNCTEST_SUITE_NAME=tempest_smoke RC_FILE_PATH=$HOME/cloner-info/overcloudrc + REPO=$REPO node-parameters: true kill-phase-on: FAILURE abort-all-job: false -- cgit 1.2.3-korg