From 5ea1d743b6e9f6b7c8765f6dfc23cae479318af1 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 3 Aug 2017 10:14:12 -0600
Subject: [PATCH] Update puppet jobs to 4.8

There have been some recent merging of changes to things like stdlib
that require 4.6+. In tripleo we actually deploy with 4.8.  This change
updates the Puppet OpenStack and puppet-tripleo jobs to use 4.8 for unit
tests.

It should be noted that 4.5 equates to Puppet Enterprise 2016.2[0]
which has already reached limited support as of October of 2016[1].
4.8[2] is in PE 2016.5 which is newer than the current LTS version.

[0] https://docs.puppet.com/puppet/4.5/release_notes.html
[1] https://puppet.com/misc/puppet-enterprise-lifecycle
[2] https://docs.puppet.com/puppet/4.8/release_notes.html

Change-Id: I6091aacd692129789b95c45c0cde55e4a55ccb51
---
 jenkins/jobs/puppet-module-jobs.yaml | 3 ++-
 zuul/layout.yaml                     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index 358834257f..52ce6871cc 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -418,8 +418,9 @@
       - 3.6
       - 3.8
       - 4.5
+      - 4.8
       - 'latest'
-    puppet_unit_version: '3.6 3.8 4.5 latest'
+    puppet_unit_version: '3.6 3.8 4.5 4.8 latest'
     node: centos-7
     legacy:
       - ''
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2ef9187d4a..ab4174b5cb 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -942,12 +942,12 @@ project-templates:
     check:
       - gate-{name}-puppet-unit-3.6-legacy-centos-7
       - gate-{name}-puppet-unit-3.8-legacy-centos-7
-      - gate-{name}-puppet-unit-4.5-centos-7
+      - gate-{name}-puppet-unit-4.8-centos-7
       - gate-{name}-puppet-unit-latest-centos-7
     gate:
       - gate-{name}-puppet-unit-3.6-legacy-centos-7
       - gate-{name}-puppet-unit-3.8-legacy-centos-7
-      - gate-{name}-puppet-unit-4.5-centos-7
+      - gate-{name}-puppet-unit-4.8-centos-7
 
   - name: infra-puppet-apply-jobs
     check:
@@ -15456,10 +15456,10 @@ projects:
       - name: tripleo-upgrade-jobs-scenario003
       - name: tripleo-upgrade-jobs-scenario004
     check:
-      - gate-puppet-tripleo-puppet-unit-4.5-centos-7
+      - gate-puppet-tripleo-puppet-unit-4.8-centos-7
       - gate-puppet-tripleo-puppet-unit-latest-centos-7
     gate:
-      - gate-puppet-tripleo-puppet-unit-4.5-centos-7
+      - gate-puppet-tripleo-puppet-unit-4.8-centos-7
 
   - name: openstack/puppet-trove
     template: