Select the right Functest repos when master

Else OpenStack Rocky is verified by Queens upper-contraints.

Change-Id: I5bfcb4895e64ab911c1131e8bfeb09eac2775754
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index aabe6eb..a4bb2be 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -546,6 +546,11 @@
               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')
@@ -554,9 +559,9 @@
           else
             functest_scenario=$DEPLOY_SCENARIO
           fi
-          echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
       - inject:
-          properties-file: functest_scenario
+          properties-file: functest_properties
           override-build-parameters: true
       - multijob:
           name: 'OPNFV Test Suite'

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 34594cc..1aa4e5c 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -416,6 +416,11 @@
               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')
@@ -424,9 +429,9 @@
           else
             functest_scenario=$DEPLOY_SCENARIO
           fi
-          echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
       - inject:
-          properties-file: functest_scenario
+          properties-file: functest_properties
           override-build-parameters: true
       - multijob:
           name: 'OPNFV Test Suite'
@@ -1115,4 +1120,3 @@
     name: 'apex-danube'
     triggers:
       - timed: '0 3 1 1 7'
-