From 36b6794f3a3c29346369f44eb4e8cccf845a2abc Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 27 Mar 2018 15:52:33 +0800
Subject: [PATCH] Support puppet 4.8 and latest for libraries unit test

Change-Id: Ie70af6ee60efee8d0fd7e81bcc2b84b8dd83b206
---
 .zuul.yaml                              | 20 ++++++++++++++++++--
 playbooks/run-libraries-unit-tests.yaml |  3 +++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 36ccc2b4b..7c51c933c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -514,6 +514,20 @@
       - ^releasenotes/.*$
       - ^test-requirements.txt$
 
+- job:
+    name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
+    parent: puppet-openstack-libraries-puppet-unit-centos-7
+    vars:
+      puppet_gem_version: 4.8
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-latest-centos-7
+    parent: puppet-openstack-libraries-puppet-unit-centos-7
+    branches: ^master
+    voting: false
+    vars:
+      puppet_gem_version: latest
+
 - project-template:
     name: puppet-openstack-library-jobs
     check:
@@ -521,12 +535,14 @@
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-3-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
-        - puppet-openstack-libraries-puppet-unit-centos-7
+        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-latest-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
     gate:
       jobs:
         - puppet-openstack-libraries-puppet-lint-centos-7
         - puppet-openstack-libraries-puppet-syntax-3-centos-7
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
-        - puppet-openstack-libraries-puppet-unit-centos-7
+        - puppet-openstack-libraries-puppet-unit-4.8-centos-7
+        - puppet-openstack-libraries-puppet-unit-latest-centos-7
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
diff --git a/playbooks/run-libraries-unit-tests.yaml b/playbooks/run-libraries-unit-tests.yaml
index 4e0d2e403..7012c1b38 100644
--- a/playbooks/run-libraries-unit-tests.yaml
+++ b/playbooks/run-libraries-unit-tests.yaml
@@ -4,6 +4,9 @@
         cmd: |
           set -e
           set -x
+          if [ "{{ puppet_gem_version }}" != "latest" ]; then
+            export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}.0'
+          fi
           ./run_unit_tests.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'