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 <trozet@redhat.com>

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 367568a..4453ee2 100644 (file)
--- 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