From d162f1f9b06996cdfba17b995aaa6034b03f90fc Mon Sep 17 00:00:00 2001
From: Anton Arefiev <aarefiev@mirantis.com>
Date: Mon, 19 Dec 2016 16:31:25 +0200
Subject: [PATCH] Use Ironic Inspector tempest plugin from master

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
---
 jenkins/jobs/ironic.yaml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index 080f91cc40..104949de30 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -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: