Merge "Update trove job to install trove tempest plugin"

This commit is contained in:
Jenkins 2016-08-24 17:57:36 +00:00 committed by Gerrit Code Review
commit 5c802129d4

View File

@ -2121,6 +2121,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