From c90867c2ea1557b4418feb1a6c8b8e5a02bf1c55 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 17 Sep 2014 10:26:50 +0100
Subject: [PATCH] Run the precise nonha job on tripleo projects

Add check-tripleo-novabm-overcloud-precise-nonha back running on tripleo
projects, it was removed some time ago due to capacity problems, we now
have the ability to run this job so should do so.

Change-Id: I9900626afdc342ad9522f124475fbd611faec3b4
---
 .../openstack_project/files/zuul/layout.yaml  | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9623310e42..b81aaed653 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1422,7 +1422,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - tuskar-tarball
@@ -1790,13 +1789,12 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
       - gate-tempest-dsvm-ironic-pxe_ssh
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - diskimage-builder-coverage
       - diskimage-builder-branch-tarball
@@ -1811,7 +1809,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - dib-utils-branch-tarball
@@ -1967,12 +1964,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-apply-config-coverage
       - os-apply-config-branch-tarball
@@ -1988,7 +1984,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
 
 #TODO: add docs
@@ -2006,12 +2001,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
@@ -2030,12 +2024,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-net-config-pep8
       - gate-os-net-config-python26
       - gate-os-net-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-net-config-coverage
       - os-net-config-branch-tarball
@@ -2055,12 +2048,11 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
-    experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-refresh-config-coverage
       - os-refresh-config-branch-tarball
@@ -2570,7 +2562,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-heat-templates-branch-tarball
@@ -2589,7 +2580,6 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-image-elements-branch-tarball
@@ -2604,10 +2594,10 @@ projects:
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
+      - check-tripleo-novabm-overcloud-precise-nonha
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-ironic-vlan-precise-nonha
     post:
       - tripleo-incubator-docs
@@ -3438,7 +3428,6 @@ projects:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
-    experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack-infra/zmq-event-publisher