diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-18 10:47:10 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-18 10:48:22 -0400 |
| commit | 2e1815d026f209e46fcc7eb29a7d4a28a48b2354 (patch) | |
| tree | 3f8a625ea64a1379b199fa6acd2bc4a4d6136b9f | |
| parent | 1f2eb7ab017494dd681917d854e5689fb49e4e38 (diff) | |
Apex: Enable OS master clients with Tempest
We want to use OS master clients when testing with master OpenStack
(scenarios without any branch in the name).
Change-Id: I6b2814dcb6fd7e8a650782e13c1a765320e8cf98
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 2f29765d2..0837a76e4 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -343,6 +343,14 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + if echo $DEPLOY_SCENARIO | 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-smoke condition: ALWAYS @@ -353,6 +361,7 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_SUITE_NAME=tempest_smoke_serial FUNCTEST_MODE=testcase + REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index becc20dde..9ad72e404 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -428,6 +428,14 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + if echo $DEPLOY_SCENARIO | 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-smoke condition: ALWAYS @@ -438,6 +446,7 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME + REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index e7d592254..29ddef9c9 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -300,6 +300,14 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true + - shell: | + if echo $DEPLOY_SCENARIO | 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-smoke condition: ALWAYS @@ -310,6 +318,7 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME + REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER |