Merge "Bump to Puppet 4.10 and Puppet 6.11"

This commit is contained in:
Zuul 2019-12-02 18:16:31 +00:00 committed by Gerrit Code Review
commit bec9f32375
3 changed files with 16 additions and 16 deletions

View File

@ -32,9 +32,9 @@
- puppet-openstack-libraries-puppet-syntax-4-centos-7 - puppet-openstack-libraries-puppet-syntax-4-centos-7
- puppet-openstack-libraries-puppet-syntax-5-centos-7 - puppet-openstack-libraries-puppet-syntax-5-centos-7
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
- puppet-openstack-libraries-puppet-unit-4.8-centos-7 - puppet-openstack-libraries-puppet-unit-4.10-centos-7
- puppet-openstack-libraries-puppet-unit-5.5-centos-7 - puppet-openstack-libraries-puppet-unit-5.5-centos-7
- puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
- puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
- puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
- puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
@ -44,9 +44,9 @@
- puppet-openstack-libraries-puppet-syntax-4-centos-7 - puppet-openstack-libraries-puppet-syntax-4-centos-7
- puppet-openstack-libraries-puppet-syntax-5-centos-7 - puppet-openstack-libraries-puppet-syntax-5-centos-7
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
- puppet-openstack-libraries-puppet-unit-4.8-centos-7 - puppet-openstack-libraries-puppet-unit-4.10-centos-7
- puppet-openstack-libraries-puppet-unit-5.5-centos-7 - puppet-openstack-libraries-puppet-unit-5.5-centos-7
- puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
- puppet-openstack-libraries-puppet-beaker-rspec-centos-7 - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
# integration jobs # integration jobs

View File

@ -2,12 +2,12 @@
# This file contains the jobs for the puppet openstack libraries # This file contains the jobs for the puppet openstack libraries
# #
- job: - job:
name: puppet-openstack-libraries-puppet-unit-4.8-centos-7 name: puppet-openstack-libraries-puppet-unit-4.10-centos-7
parent: puppet-openstack-libraries-puppet-unit-base parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-7 nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$ branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars: vars:
puppet_gem_version: 4.8 puppet_gem_version: 4.10
- job: - job:
name: puppet-openstack-libraries-puppet-unit-5.5-centos-7 name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
@ -18,12 +18,12 @@
- job: - job:
name: puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic name: puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-unit-base parent: puppet-openstack-libraries-puppet-unit-base
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$ branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
vars: vars:
puppet_gem_version: 6.4 puppet_gem_version: 6.11
- job: - job:
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic

View File

@ -2,12 +2,12 @@
# This file contains the puppet unit job configurations # This file contains the puppet unit job configurations
# #
- job: - job:
name: puppet-openstack-unit-4.8-centos-7 name: puppet-openstack-unit-4.10-centos-7
parent: puppet-openstack-unit-base parent: puppet-openstack-unit-base
nodeset: centos-7 nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$ branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars: vars:
puppet_gem_version: 4.8 puppet_gem_version: 4.10
- job: - job:
name: puppet-openstack-unit-5.5-centos-7 name: puppet-openstack-unit-5.5-centos-7
@ -17,12 +17,12 @@
puppet_gem_version: 5.5 puppet_gem_version: 5.5
- job: - job:
name: puppet-openstack-unit-6.4-ubuntu-bionic name: puppet-openstack-unit-6.11-ubuntu-bionic
parent: puppet-openstack-unit-base parent: puppet-openstack-unit-base
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$ branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
vars: vars:
puppet_gem_version: 6.4 puppet_gem_version: 6.11
- job: - job:
name: puppet-openstack-unit-latest-ubuntu-bionic name: puppet-openstack-unit-latest-ubuntu-bionic
@ -40,12 +40,12 @@
name: puppet-openstack-module-unit-jobs name: puppet-openstack-module-unit-jobs
check: check:
jobs: jobs:
- puppet-openstack-unit-4.8-centos-7 - puppet-openstack-unit-4.10-centos-7
- puppet-openstack-unit-5.5-centos-7 - puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-6.4-ubuntu-bionic - puppet-openstack-unit-6.11-ubuntu-bionic
- puppet-openstack-unit-latest-ubuntu-bionic - puppet-openstack-unit-latest-ubuntu-bionic
gate: gate:
jobs: jobs:
- puppet-openstack-unit-4.8-centos-7 - puppet-openstack-unit-4.10-centos-7
- puppet-openstack-unit-5.5-centos-7 - puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-6.4-ubuntu-bionic - puppet-openstack-unit-6.11-ubuntu-bionic