From 780fc43ba06b7650d25802b153d63e4c6ce6987c Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 26 Oct 2018 00:30:26 +0200
Subject: [PATCH] Update pupppet 4 unit to use 4.10

Run puppet 4.10 for the puppet 4 unit tests.

Change-Id: I237dca8971a876ab677a8c77c5e35941dfb4fd11
---
 .zuul.yaml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8853aabd3..e645a3bc5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -460,17 +460,16 @@
       - ^.gitignore$
 
 - 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
     vars:
-      puppet_gem_version: 4.8
+      puppet_gem_version: 4.10
 
 - job:
     name: puppet-openstack-unit-5.5-centos-7
     parent: puppet-openstack-unit-base
     nodeset: centos-7
-    branches: ^master
     vars:
       puppet_gem_version: 5.5
 
@@ -487,12 +486,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-latest-centos-7
     gate:
       jobs:
-        - puppet-openstack-unit-4.8-centos-7
+        - puppet-openstack-unit-4.10-centos-7
         - puppet-openstack-unit-5.5-centos-7
 
 - project-template:
@@ -659,10 +658,10 @@
       - ^.gitignore$
 
 - 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-centos-7
     vars:
-      puppet_gem_version: 4.8
+      puppet_gem_version: 4.10
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
@@ -726,9 +725,6 @@
       jobs:
         - tripleo-puppet-ci-centos-7-standalone
 
-
-
-
 - project-template:
     name: puppet-openstack-library-jobs
     check:
@@ -736,7 +732,7 @@
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
-        - 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-latest-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
@@ -746,7 +742,7 @@
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
-        - 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-beaker-rspec-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic