From 0beb85cdb4ca0d1aba3216ca59ebdc6c09470b36 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 21 Nov 2019 22:38:58 +0100
Subject: [PATCH] Bump to Puppet 4.10 and Puppet 6.11

Change-Id: I7c2bdcf0236aa73361e05967458d18d815e8cd17
---
 zuul.d/layout.yaml    |  8 ++++----
 zuul.d/libraries.yaml |  8 ++++----
 zuul.d/unit.yaml      | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a7440166f..7d1e35574 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -32,9 +32,9 @@
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-4.10-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
@@ -44,9 +44,9 @@
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-4.10-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
-        - puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
+        - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
 
 # integration jobs
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 8955e5f5a..89f6bc22f 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -2,12 +2,12 @@
 # This file contains the jobs for the puppet openstack libraries
 #
 - job:
-    name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
+    name: puppet-openstack-libraries-puppet-unit-4.10-centos-7
     parent: puppet-openstack-libraries-puppet-unit-base
     nodeset: centos-7
     branches: ^stable/(ocata|pike|queens|rocky|stein)$
     vars:
-      puppet_gem_version: 4.8
+      puppet_gem_version: 4.10
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
@@ -18,12 +18,12 @@
 
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
+    name: puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-unit-base
     branches: ^(stable/stein|master)$
     nodeset: ubuntu-bionic
     vars:
-      puppet_gem_version: 6.4
+      puppet_gem_version: 6.11
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index b2783e990..b4923a9c1 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -2,12 +2,12 @@
 # This file contains the puppet unit job configurations
 #
 - job:
-    name: puppet-openstack-unit-4.8-centos-7
+    name: puppet-openstack-unit-4.10-centos-7
     parent: puppet-openstack-unit-base
     nodeset: centos-7
     branches: ^stable/(ocata|pike|queens|rocky|stein)$
     vars:
-      puppet_gem_version: 4.8
+      puppet_gem_version: 4.10
 
 - job:
     name: puppet-openstack-unit-5.5-centos-7
@@ -17,12 +17,12 @@
       puppet_gem_version: 5.5
 
 - job:
-    name: puppet-openstack-unit-6.4-ubuntu-bionic
+    name: puppet-openstack-unit-6.11-ubuntu-bionic
     parent: puppet-openstack-unit-base
     nodeset: ubuntu-bionic
     branches: ^(stable/stein|master)$
     vars:
-      puppet_gem_version: 6.4
+      puppet_gem_version: 6.11
 
 - job:
     name: puppet-openstack-unit-latest-ubuntu-bionic
@@ -40,12 +40,12 @@
     name: puppet-openstack-module-unit-jobs
     check:
       jobs:
-        - puppet-openstack-unit-4.8-centos-7
+        - puppet-openstack-unit-4.10-centos-7
         - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.4-ubuntu-bionic
+        - puppet-openstack-unit-6.11-ubuntu-bionic
         - puppet-openstack-unit-latest-ubuntu-bionic
     gate:
       jobs:
-        - puppet-openstack-unit-4.8-centos-7
+        - puppet-openstack-unit-4.10-centos-7
         - puppet-openstack-unit-5.5-centos-7
-        - puppet-openstack-unit-6.4-ubuntu-bionic
+        - puppet-openstack-unit-6.11-ubuntu-bionic