From 638682b2cfb0285b00da9fc012847b2b83bc5ee1 Mon Sep 17 00:00:00 2001
From: Devananda van der Veen <devananda.vdv@gmail.com>
Date: Thu, 9 Jan 2014 18:24:53 -0800
Subject: [PATCH] Enable tempest/ironic gate tests

Enable tempest tests in Ironic's check and gate pipelines.

Enable non-voting tests in the check pipeline
for tempest and devstack and devstack-gate.

Change-Id: I5e9d8831d890e771eba0a2116a22f7661d6078d7
---
 .../jenkins_job_builder/config/projects.yaml  | 10 ++++++++++
 .../openstack_project/files/zuul/layout.yaml  | 19 ++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 0e88ee8eb7..7ac74ca1fa 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1586,6 +1586,16 @@
       - python-jobs
       - openstack-publish-jobs
       - translation-jobs
+      - '{pipeline}-tempest-dsvm-ironic{branch-designator}':
+          pipeline: check
+          node: devstack-precise
+          branch-designator: '-nv'
+          branch-override: default
+      - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}':
+          pipeline: check
+          node: devstack-precise
+          branch-designator: '-nv'
+          branch-override: default
 
 - project:
     name: python-ironicclient
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 44a52e0b07..81e624ba94 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -234,6 +234,10 @@ jobs:
     voting: false
   - name: gate-tripleo-deploy
     voting: false
+  - name: check-tempest-dsvm-ironic-nv
+    voting: false
+  - name: check-tempest-dsvm-ironic-postgres-nv
+    voting: false
   - name: ^(gate|check)-devstack-dsvm-cells$
     voting: false
   - name: ^(gate|check)-gantt-python2(6|7)$
@@ -680,11 +684,12 @@ projects:
       - name: openstack-server-publish-jobs
     check:
       - gate-ironic-requirements
-    gate:
-      - gate-ironic-requirements
-    experimental:
       - check-tempest-dsvm-ironic
       - check-tempest-dsvm-ironic-postgres
+    gate:
+      - gate-ironic-requirements
+      - gate-tempest-dsvm-ironic
+      - gate-tempest-dsvm-ironic-postgres
     post:
       - ironic-upstream-translation-update
     pre-release:
@@ -1855,6 +1860,8 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm
+      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-postgres-nv
     gate:
       - gate-tempest-requirements
       - gate-tempest-pep8
@@ -1875,8 +1882,6 @@ projects:
       - gate-tempest-dsvm-savanna-postgres-full
       - gate-tempest-dsvm-savanna-neutron
       - gate-tempest-dsvm-trove-full
-      - check-tempest-dsvm-ironic
-      - check-tempest-dsvm-ironic-postgres
       - check-tempest-dsvm-neutron-isolated
       - check-tempest-dsvm-neutron-pg-isolated
     post:
@@ -2099,6 +2104,8 @@ projects:
       - check-grenade-dsvm-forward
       - check-swift-dsvm-functional
       - check-devstack-dsvm-neutron
+      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-postgres-nv
     gate:
       - gate-devstack-bash8
       - gate-tempest-dsvm-full
@@ -2279,6 +2286,8 @@ projects:
       - check-devstack-dsvm-cells-havana
       - check-tempest-dsvm-cells-havana
       - check-tempest-dsvm-cells-full-havana
+      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-postgres-nv
     gate:
       - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full