From 557a3e3bf6b18107472cd38a31d0ba8625236e85 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Wed, 25 Jul 2018 13:58:35 +0200 Subject: [PATCH] Fix libraries jobs So that we run testing on puppet 4 and puppet 5 for libraries where both are voting. We are still having the job running the latest puppet version unit tests but as non voting which is the same as for the integration tests. Also removes puppet 3 syntax and adds puppet 5. Change-Id: I5f78c19922677265cac54a39b29d8b9111bf2b52 --- .zuul.yaml | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index fc56be3e7..fa861e9e8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -544,7 +544,7 @@ nodepool_type: centos7 - job: - name: puppet-openstack-beaker-bionic + name: puppet-openstack-beaker-ubuntu-bionic parent: puppet-openstack-beaker-run-base nodeset: ubuntu-bionic vars: @@ -555,11 +555,11 @@ check: jobs: - puppet-openstack-beaker-centos-7 - - puppet-openstack-beaker-bionic + - puppet-openstack-beaker-ubuntu-bionic gate: jobs: - puppet-openstack-beaker-centos-7 - - puppet-openstack-beaker-bionic + - puppet-openstack-beaker-ubuntu-bionic - job: name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7 @@ -605,14 +605,6 @@ - ^LICENSE$ - ^.gitignore$ -- job: - name: puppet-openstack-libraries-puppet-syntax-3-centos-7 - parent: puppet-openstack-libraries-puppet-syntax - nodeset: centos-7 - branches: ^(stable/(newton|ocata)).*$ - vars: - puppet: 3 - - job: name: puppet-openstack-libraries-puppet-syntax-4-centos-7 parent: puppet-openstack-libraries-puppet-syntax @@ -620,6 +612,13 @@ vars: puppet: 4 +- job: + name: puppet-openstack-libraries-puppet-syntax-5-centos-7 + parent: puppet-openstack-libraries-puppet-syntax + nodeset: centos-7 + vars: + puppet: 5 + - job: name: puppet-openstack-libraries-puppet-unit-centos-7 parent: puppet-openstack-integration-base @@ -644,6 +643,12 @@ vars: puppet_gem_version: 4.8 +- job: + name: puppet-openstack-libraries-puppet-unit-5.5-centos-7 + parent: puppet-openstack-libraries-puppet-unit-centos-7 + vars: + puppet_gem_version: 5.5 + - job: name: puppet-openstack-libraries-puppet-unit-latest-centos-7 parent: puppet-openstack-libraries-puppet-unit-centos-7 @@ -698,16 +703,18 @@ check: 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-syntax-5-centos-7 - puppet-openstack-libraries-puppet-unit-4.8-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 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-syntax-5-centos-7 - puppet-openstack-libraries-puppet-unit-4.8-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