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
This commit is contained in:
Tobias Urdin 2018-07-25 13:58:35 +02:00
parent 476c9b7fc2
commit 557a3e3bf6
1 changed files with 20 additions and 13 deletions

View File

@ -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