From 43bf6fdf8e1d409fcabdc804ca4628df65cf5417 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sun, 3 Jun 2018 11:46:23 +0200
Subject: [PATCH] Add experimental puppet 4 beaker-rspec jobs
Change-Id: If11d4d2c8a82507d7f9cfb7f3456bcc30fac7488
---
playbooks/infra-puppet-beaker-rspec/run.yaml | 1 +
zuul.d/jobs.yaml | 34 ++++++++++++++++++++
zuul.d/project-templates.yaml | 10 ++++++
3 files changed, 45 insertions(+)
diff --git a/playbooks/infra-puppet-beaker-rspec/run.yaml b/playbooks/infra-puppet-beaker-rspec/run.yaml
index f3a5ccd6..e92576b3 100644
--- a/playbooks/infra-puppet-beaker-rspec/run.yaml
+++ b/playbooks/infra-puppet-beaker-rspec/run.yaml
@@ -51,3 +51,4 @@
chdir: "{{ project_src_dir }}"
environment:
'GEM_HOME': "{{ ansible_user_dir }}/.bundled_gems"
+ 'PUPPET_VERSION': "{{ puppet_version | default('3') }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8212373e..6f427d4b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1337,6 +1337,22 @@
vars:
nodeset: nodepool-centos7
+- job:
+ name: puppet-beaker-rspec-puppet-4-infra
+ parent: puppet-beaker-rspec-infra
+ description: |
+ Run beaker-rspec functional tests with puppet 4 on Ubuntu Xenial
+ vars:
+ puppet_version: 4
+
+- job:
+ name: puppet-beaker-rspec-puppet-4-centos-7-infra
+ parent: puppet-beaker-rspec-centos-7-infra
+ description: |
+ Run beaker-rspec functional tests with puppet 4 on CentOS 7
+ vars:
+ puppet_version: 4
+
- job:
name: openstackci-beaker
parent: puppet-beaker-rspec-infra
@@ -1357,6 +1373,24 @@
vars:
nodeset: nodepool-trusty
+- job:
+ name: openstackci-beaker-puppet-4
+ parent: openstackci-beaker
+ description: |
+ Run beaker-rspec functional tests with puppet 4 on Ubuntu Xenial for the
+ puppet-openstackci module
+ vars:
+ puppet_version: 4
+
+- job:
+ name: openstackci-beaker-puppet-4-centos-7
+ parent: openstackci-beaker-centos-7
+ description: |
+ Run beaker-rspec functional tests with puppet 4 on CentOS 7 for the
+ puppet-openstackci module
+ vars:
+ puppet_version: 4
+
- job:
name: ansible-role-functional-base
abstract: true
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index ff2286ef..567fa67e 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1045,6 +1045,9 @@
gate:
jobs:
- puppet-beaker-rspec-infra
+ experimental:
+ jobs:
+ - puppet-beaker-rspec-puppet-4-infra
- project-template:
name: puppet-beaker-jobs-xenial-infra-nv
@@ -1061,6 +1064,9 @@
gate:
jobs:
- puppet-beaker-rspec-centos-7-infra
+ experimental:
+ jobs:
+ - puppet-beaker-rspec-puppet-4-centos-7-infra
- project-template:
name: infra-puppet-apply-jobs
@@ -1084,3 +1090,7 @@
- infra-puppet-apply-4-centos-7
- infra-puppet-apply-4-ubuntu-xenial
- openstackci-beaker
+ experimental:
+ jobs:
+ - openstackci-beaker-puppet-4-centos-7
+ - openstackci-beaker-puppet-4