From da800088cff40cd522d0bc24cb0368cb2223bfe7 Mon Sep 17 00:00:00 2001
From: "John L. Villalovos" <john.l.villalovos@intel.com>
Date: Tue, 18 Oct 2016 15:18:21 -0700
Subject: [PATCH] Add experimental ironic grenade multitenant job

Add an experimental ironic grenade multitenant job. We need to make
sure that grenade will work in a multi-tenant environment.

Change-Id: Id3ac0d4118943a6deaafd645d965826a5f6213d5
---
 jenkins/jobs/ironic.yaml   | 41 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           |  1 +
 3 files changed, 47 insertions(+)

diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index f0b10ef946..14b25ac544 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -6,6 +6,17 @@
             {script}
           EOF
 
+- builder:
+    name: ironic-grenade
+    builders:
+      - ironic-extra-vars:
+          script: |
+            export PROJECTS="openstack-dev/grenade $PROJECTS"
+            export DEVSTACK_GATE_GRENADE=pullup
+            export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
+            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
+            export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
+
 - builder:
     name: ironic-client-from-source
     builders:
@@ -1016,6 +1027,36 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-grenade-dsvm-ironic-multitenant{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - ironic-grenade
+      - ironic-multitenant
+      - ironic-deploy-with-IPA:
+          ramdisk-type: 'tinyipa'
+      - devstack-virtual-ironic:
+          build-ramdisk: ''
+          deploy_driver: pxe_ssh
+          image-type: wholedisk
+          branch-override: '{branch-override}'
+          bm-vm-count: 7
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-grenade-dsvm-ironic-inspector{job-suffix}'
     node: '{node}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d45ed5c31f..76d3fbc7a3 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5581,6 +5581,11 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
+      - '{pipeline}-grenade-dsvm-ironic-multitenant{job-suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-ironic-dsvm-multitest{job-suffix}':
           pipeline: gate
           node: ubuntu-xenial
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 33032f0a93..1bfac5cfb0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10261,6 +10261,7 @@ projects:
       - gate-tempest-dsvm-ironic-parallel-nv
       - gate-tempest-dsvm-ironic-pxe_ipa-full-nv
       - gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ssh-tinyipa-multinode-nv
+      - gate-grenade-dsvm-ironic-multitenant-nv
       - gate-ironic-dsvm-multitest-nv
 
   - name: openstack/ironic-inspector