From d480c48d91186151d24b87c17398f7857c653a45 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Sat, 18 Apr 2015 10:51:51 -0400
Subject: [PATCH] Puppet OpenStack: enable Puppet 4.0 as non voting

Puppet 4.0 is out [1] so we want to support this release for our
modules.
* Create gate-puppet-{module}-puppet-unit-4.0 jobs for all Puppet
  OpenStack modules
* Enable the job in check as non-voting jobs

[1] https://github.com/puppetlabs/puppet/releases/tag/4.0.0

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

diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index c95c3d2e7a..c405b8a55c 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -138,5 +138,6 @@
       - 3.4
       - 3.6
       - 3.7
+      - 4.0
     jobs:
       - 'gate-{name}-puppet-unit-{puppet_version}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 04875d7540..92bc16eedf 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -484,12 +484,14 @@ project-templates:
       # 3.5 was swiftly replaced with 3.6
       - gate-{name}-puppet-unit-3.6
       - gate-{name}-puppet-unit-3.7
+      - gate-{name}-puppet-unit-4.0
     gate:
       - gate-{name}-puppet-unit-3.3
       - gate-{name}-puppet-unit-3.4
       # 3.5 was swiftly replaced with 3.6
       - gate-{name}-puppet-unit-3.6
       - gate-{name}-puppet-unit-3.7
+      # TODO(emilienm): add 4.0 when it will vote
 
   - name: infra-puppet-apply-jobs
     check:
@@ -1078,6 +1080,9 @@ jobs:
     voting: false
   - name: ^(gate-)?devstack-publish-docs
     branch: ^master
+  # TODO(emilienm): Enable voting when all tests pass for all modules
+  - name: ^gate-puppet-.*-puppet-unit-4.0$
+    voting: false
   - name: ^gate-puppet-.*-puppet-beaker-rspec$
     voting: false
   - name: ^gate-puppet-.*-puppet-syntax-future$