From c3803c5906266ef7500b40f0846b94731431d931 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@redhat.com>
Date: Tue, 10 Nov 2015 09:50:30 +0100
Subject: [PATCH] Add IPA-based job for ironic-inspector

IPA (ironic-python-agent) is a new default ramdisk for ironic,
replacing old bash-based ramdisks in diskimage-builder.

This change adds a new job to ironic-inspector using IPA for both
deploy and inspection. Old job now has -dib postfix to avoid confusion.

Change-Id: I0108f432872d84a40203153a592e11a697da1e68
---
 jenkins/jobs/ironic.yaml   |  6 +++++-
 jenkins/jobs/projects.yaml | 12 ++++++++++--
 zuul/layout.yaml           |  7 ++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index b6045c200c..e8bbb071d9 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -76,7 +76,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironic-inspector-dsvm{job-suffix}'
+    name: '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -103,6 +103,10 @@
 
           export PROJECTS="openstack/ironic-inspector $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
+          if [ "{ramdisk}" == "ipa" ] ; then
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_RAMDISK_ELEMENT=ironic-agent"
+          fi
 
           function post_test_hook {{
                 source $BASE/new/devstack/openrc admin admin
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index f4317ed640..e87cf2c09b 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1995,11 +1995,12 @@
           node: 'devstack-precise || devstack-trusty'
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-ironic-inspector-dsvm{job-suffix}':
+      - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           job-suffix: '-nv'
           branch-override: default
+          ramdisk: dib
       - '{trigger}-tripleo-ci-{jobname}':
           jobname: 'f21-nonha'
           type: 'nonha'
@@ -2042,11 +2043,18 @@
       - translation-jobs
       - gate-{name}-tox-{envlist}:
           envlist: func
-      - '{pipeline}-ironic-inspector-dsvm{job-suffix}':
+      - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           job-suffix: ''
           branch-override: default
+          ramdisk: 'dib'
+      - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          job-suffix: '-nv'
+          branch-override: default
+          ramdisk: 'ipa'
 
 - project:
     name: ironic-lib
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4784da4202..bb2efd9fc2 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5474,7 +5474,7 @@ projects:
       - gate-grenade-dsvm-ironic-sideways
       - gate-tempest-dsvm-ironic-pxe_ipa
       - gate-tempest-dsvm-ironic-pxe_ipa-ipxe-nv
-      - gate-ironic-inspector-dsvm-nv
+      - gate-ironic-inspector-dsvm-dib-nv
     gate:
       - gate-tempest-dsvm-ironic-agent_ssh
       - gate-tempest-dsvm-ironic-pxe_ipa
@@ -5497,12 +5497,13 @@ projects:
       - gate-ironic-inspector-pep8
       - gate-ironic-inspector-python27
       - gate-ironic-inspector-tox-func
-      - gate-ironic-inspector-dsvm
+      - gate-ironic-inspector-dsvm-dib
+      - gate-ironic-inspector-dsvm-ipa-nv
     gate:
       - gate-ironic-inspector-pep8
       - gate-ironic-inspector-python27
       - gate-ironic-inspector-tox-func
-      - gate-ironic-inspector-dsvm
+      - gate-ironic-inspector-dsvm-dib
 
   - name: openstack/ironic-lib
     template: