From 153374ec3ab962112d1e390f3fafdbee411e4722 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Thu, 30 Jun 2016 09:40:10 +0100
Subject: [PATCH] Move the tripleo OVB job to the check-tripleo queue

We now know the OVB job on rh2 works, move it to run on all patches
but keep is as non voting until next week when the jobs on rh1 will
be dropped.

Change-Id: I363ae44799fc03b768851e9faa75d75840ffe41d
---
 nodepool/nodepool.yaml | 2 +-
 zuul/layout.yaml       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index d07c08ae57..045f0c6a6a 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -135,7 +135,7 @@ labels:
   - name: tripleo-centos-7-ovb
     image: centos-7
     ready-script: configure_mirror.sh
-    min-ready: 3
+    min-ready: 6
     providers:
       - name: tripleo-test-cloud-rh2
 providers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fe780d3106..f16dc3a2ad 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -909,6 +909,7 @@ project-templates:
       - gate-tripleo-ci-centos-7-upgrades
       - gate-tripleo-ci-centos-7-ha
       - gate-tripleo-ci-centos-7-nonha
+      - gate-tripleo-ci-centos-7-ovb-ha
     experimental-tripleo:
       - gate-tripleo-ci-centos-7-containers
       - gate-tripleo-ci-centos-7-ha-tempest
@@ -1902,6 +1903,9 @@ jobs:
   - name: gate-ironicclient-dsvm-functional
     voting: false
 
+  - name: gate-tripleo-ci-centos-7-ovb-ha
+    voting: false
+
   - name: gate-tripleo-ci-centos-7-containers
     voting: false
 
@@ -4243,8 +4247,6 @@ projects:
       - periodic-tripleo-ci-centos-7-ha-liberty
       - periodic-tripleo-ci-centos-7-ha-mitaka
       - periodic-tripleo-ci-centos-7-ha-tempest
-    experimental-tripleo:
-      - gate-tripleo-ci-centos-7-ovb-ha
 
   - name: openstack-infra/trystack-site
     template: