From 022af0fc20c24dbf5ed68b534dff964e9bf92048 Mon Sep 17 00:00:00 2001 From: Eyal Date: Wed, 3 Apr 2019 15:24:11 +0300 Subject: [PATCH] use a rc file for defining tempest version checkout to the right tempest version read from a file Change-Id: If0173d989f1afce6c193159a5f491f5cb2b94d10 --- devstack/devstackgaterc | 1 + playbooks/legacy/vitrage-dsvm-api-py27/run.yaml | 10 ++++++++++ playbooks/legacy/vitrage-dsvm-api-py35/run.yaml | 10 ++++++++++ .../legacy/vitrage-dsvm-datasources-py27/run.yaml | 10 ++++++++++ .../legacy/vitrage-dsvm-datasources-py35/run.yaml | 10 ++++++++++ playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml | 10 ++++++++++ playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml | 10 ++++++++++ 7 files changed, 61 insertions(+) create mode 100644 devstack/devstackgaterc diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc new file mode 100644 index 000000000..b0d49025a --- /dev/null +++ b/devstack/devstackgaterc @@ -0,0 +1 @@ +export TEMPEST_VERSION=master \ No newline at end of file diff --git a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml index 87fb8539a..328cd601e 100644 --- a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml @@ -47,10 +47,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'api' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml index de08b2e46..753fbfce5 100644 --- a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml @@ -47,10 +47,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'api' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml index 4f5c17e86..69d34aad6 100644 --- a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml @@ -47,10 +47,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'datasources' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml index b2c9025fb..43330469f 100644 --- a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml @@ -47,10 +47,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'datasources' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml index a14829bc5..d5e36f4c0 100644 --- a/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml @@ -45,10 +45,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'mock' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash diff --git a/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml index 11d279c2b..f31d4bf9f 100644 --- a/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml +++ b/playbooks/legacy/vitrage-dsvm-mock-py35/run.yaml @@ -45,10 +45,20 @@ export -f gate_hook function post_test_hook { + if [[ "$TEMPEST_VERSION" != "master" ]]; then + # use vitrage-tempest-plugin $TEMPEST_VERSION + # which is defined in the devstackgaterc file + + cd $BASE/new/vitrage-tempest-plugin/ + git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION + fi + source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'mock' } export -f post_test_hook + export DEVSTACK_GATE_SETTINGS=$BASE/new/vitrage/devstack/devstackgaterc + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash