openstack/project-config
Code Issues Proposed changes

Use Ironic Inspector tempest plugin from master

Browse Source 
Fetch master to install the plugin if a patch isn't against
master. And on master, use the local change to pick up any
changes to the plugin.
Ironic is doing this already.

Otherwise it could have side effect when tempest breaks Inspector
grenade, where we need to fix tempest plugin for both branches.
And it's hard to do with voting grenade job
I2660fda0c5aeca656be5c7b565f2e0bf255658f1.

Also fix ironic's version of this to append to TEMPEST_PLUGINS instead
of clobbering it.

Change-Id: I547650f221f481d28931af8e4a45daf17aa3f765
This commit is contained in:
Anton Arefiev 2016-12-19 16:31:25 +02:00 committed by Jim Rollenhagen
parent 689a63af48
commit d162f1f9b0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jenkins/jobs/ironic.yaml
View File

@ -147,7 +147,16 @@
script: |
export PROJECTS="openstack/ironic-inspector $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-inspector'"
# use tempest plugin
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) 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/ironic-inspector'"
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/ironic-inspector'"
fi
export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery}
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
@ -184,10 +193,10 @@
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) 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/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
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/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
fi
- builder: