From ced84c5f8306fa9fa686dc0977b045bd00f3faa1 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Mon, 16 Apr 2018 21:07:51 +0200
Subject: [PATCH] Add experimental puppet 4 apply-test jobs

Fix the centos-7 job to actually use puppet 4 and add an experimental
puppet 4 job for ubuntu-xenial.

Change-Id: I33041a30f036673ef5e82b83e5eae933b4168f5b
Story: #2000243
---
 playbooks/infra-puppet-apply/run.yaml     | 8 ++++++--
 zuul.d/jobs.yaml                          | 8 ++++++++
 zuul.d/zuul-legacy-project-templates.yaml | 1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/playbooks/infra-puppet-apply/run.yaml b/playbooks/infra-puppet-apply/run.yaml
index ce120622..1349255c 100644
--- a/playbooks/infra-puppet-apply/run.yaml
+++ b/playbooks/infra-puppet-apply/run.yaml
@@ -1,8 +1,12 @@
 - hosts: all
-  name: infra-puppet-apply-3
+  name: infra-puppet-apply
   tasks:
 
     - name: Run puppet-apply test
-      command: ./tools/apply-test.sh
+      shell: ./tools/apply-test.sh
       args:
         chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/system-config'].src_dir }}"
+      environment:
+        PUPPET_VERSION: "{{ puppet_version | default('3') }}"
+      tags:
+        - skip_ansible_lint
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 75b12b83..de7efc45 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1203,6 +1203,14 @@
     name: infra-puppet-apply-4-centos-7
     parent: infra-puppet-apply-base
     nodeset: centos-7
+    vars:
+      puppet_version: 4
+
+- job:
+    name: infra-puppet-apply-4-ubuntu-xenial
+    parent: infra-puppet-apply-base
+    vars:
+      puppet_version: 4
 
 - job:
     name: ansible-role-functional-base
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index dd21892f..2160471d 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -63,6 +63,7 @@
     experimental:
       jobs:
         - infra-puppet-apply-4-centos-7
+        - infra-puppet-apply-4-ubuntu-xenial
 
 - project-template:
     name: infra-puppet-check-jobs