From bc2f6197bd07a53b3a343fbcc4616dd7ab06a148 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 31 Jul 2015 19:19:00 -0400
Subject: [PATCH] Move puppet-unit gate to devstack-centos7

The main reason is to move away from the bare nodes, since -infra will
be retiring in the future.  Additionally, we move into centos7 to
avoid the hurt of other projects using devstack-trusty.

Since we are installing puppet from gems, we don't need to rely on the
OS as much. However, if we want to add a devstack-trusty node in the
future, we now can easily.

Change-Id: I79d216c4c84ebc954caef627ce64d7e72fdad8ff
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 jenkins/jobs/puppet-module-jobs.yaml | 12 ++++++++----
 zuul/layout.yaml                     | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index 43e70397e9..1452b8c6ac 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -1,11 +1,13 @@
 - job-template:
-    name: 'gate-{name}-puppet-unit-{puppet_version}'
-    node: '{node}'
+    name: 'gate-{name}-puppet-unit-{puppet_version}-dsvm-{ostype}'
+    node: 'devstack-{ostype}'
 
     builders:
       - puppet-prepare-node
-      - revoke-sudo
       - gerrit-git-prep
+      - shell: |
+          sudo gem install bundler --no-rdoc --no-ri --verbose
+      - revoke-sudo
       - shell: |
           if [ "{puppet_version}" != "latest" ]; then
             export PUPPET_GEM_VERSION='~> {puppet_version}.0'
@@ -230,8 +232,10 @@
       - 3.8
       - 4.0
       - 'latest'
+    ostype:
+      - centos7
     jobs:
-      - 'gate-{name}-puppet-unit-{puppet_version}'
+      - 'gate-{name}-puppet-unit-{puppet_version}-dsvm-{ostype}'
 
 - job-group:
     name: 'puppet-beaker-jobs'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d48a25c2ff..0c22eea16e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -509,22 +509,22 @@ project-templates:
 
   - name: puppet-module-unit-jobs
     check:
-      - gate-{name}-puppet-unit-3.3
-      - gate-{name}-puppet-unit-3.4
+      - gate-{name}-puppet-unit-3.3-dsvm-centos7
+      - gate-{name}-puppet-unit-3.4-dsvm-centos7
       # 3.5 was swiftly replaced with 3.6
-      - gate-{name}-puppet-unit-3.6
-      - gate-{name}-puppet-unit-3.7
-      - gate-{name}-puppet-unit-3.8
-      - gate-{name}-puppet-unit-4.0
-      - gate-{name}-puppet-unit-latest
+      - gate-{name}-puppet-unit-3.6-dsvm-centos7
+      - gate-{name}-puppet-unit-3.7-dsvm-centos7
+      - gate-{name}-puppet-unit-3.8-dsvm-centos7
+      - gate-{name}-puppet-unit-4.0-dsvm-centos7
+      - gate-{name}-puppet-unit-latest-dsvm-centos7
     gate:
-      - gate-{name}-puppet-unit-3.3
-      - gate-{name}-puppet-unit-3.4
+      - gate-{name}-puppet-unit-3.3-dsvm-centos7
+      - gate-{name}-puppet-unit-3.4-dsvm-centos7
       # 3.5 was swiftly replaced with 3.6
-      - gate-{name}-puppet-unit-3.6
-      - gate-{name}-puppet-unit-3.7
-      - gate-{name}-puppet-unit-3.8
-      - gate-{name}-puppet-unit-4.0
+      - gate-{name}-puppet-unit-3.6-dsvm-centos7
+      - gate-{name}-puppet-unit-3.7-dsvm-centos7
+      - gate-{name}-puppet-unit-3.8-dsvm-centos7
+      - gate-{name}-puppet-unit-4.0-dsvm-centos7
 
   - name: infra-puppet-apply-jobs
     check: