From 553f1d113f2f7d5f81efa361a39d01f9ddc41198 Mon Sep 17 00:00:00 2001 From: Mariam John Date: Thu, 18 Aug 2016 00:40:06 -0700 Subject: [PATCH] Update trove job to install trove tempest plugin Currently the gate-tempest-dsvm-trove job fails because tempest does not know the entry point for the trove tempest plugin. This change updates the gate-tempest-dsvm-trove job to install the Trove tempest plugin in the tempest venv. Change-Id: I28f8b29b0193725ea2514594ff5f4946ad0762a9 --- jenkins/jobs/devstack-gate.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 17f151dcda..3d0068594e 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2089,6 +2089,17 @@ else export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" fi + + # use tempest plugin (copied from ironic.yaml) + if [[ "$ZUUL_BRANCH" != "master" ]] ; then + # if this isn't a patch against master, then + # fetch master to install the plugin + export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=git+git://git.openstack.org/openstack/trove" + else + # on master, use the local change, so we can pick up any changes to the plugin + export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=/opt/stack/new/trove" + fi + export PROJECTS="openstack/trove-dashboard $PROJECTS" export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then