summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-05 10:06:40 +0000
committerGerrit Code Review <review@openstack.org>2018-01-05 10:06:40 +0000
commit5df26730bb3940783fac7d3c3a975484f10a19bc (patch)
tree8842424f4bf9aed67873a9eaa1e459c51bdeef7d
parent0ef4c4fc066f4065fb01a8f00800b44b50d41c43 (diff)
parent35937de54348db8e2b0fa5570f0c0fb2c70afffb (diff)
downloadpython-troveclient-5df26730bb3940783fac7d3c3a975484f10a19bc.tar.gz
Merge "Consume new trove tempest plugin"
-rw-r--r--.zuul.yaml1
-rw-r--r--playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml2
2 files changed, 3 insertions, 0 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 925fa3e..0c0ba50 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,3 +25,4 @@
- openstack/trove
- openstack/trove-dashboard
- openstack/tempest
+ - openstack/trove-tempest-plugin
diff --git a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
index a4238c8..985b9e6 100644
--- a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
@@ -31,6 +31,7 @@
cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]]
enable_plugin trove git://git.openstack.org/openstack/trove
+ TEMPEST_PLUGINS='/opt/stack/new/trove-tempest-plugin'
EOF
executable: /bin/bash
@@ -51,6 +52,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/trove-dashboard $PROJECTS"
+ export PROJECTS="openstack/trove-tempest-plugin $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh