Merge "Fix libraries jobs"

This commit is contained in:
Zuul 2018-08-08 13:44:49 +00:00 committed by Gerrit Code Review
commit cefbf4fed0

View File

@ -545,7 +545,7 @@
nodepool_type: centos7 nodepool_type: centos7
- job: - job:
name: puppet-openstack-beaker-bionic name: puppet-openstack-beaker-ubuntu-bionic
parent: puppet-openstack-beaker-run-base parent: puppet-openstack-beaker-run-base
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
vars: vars:
@ -556,11 +556,11 @@
check: check:
jobs: jobs:
- puppet-openstack-beaker-centos-7 - puppet-openstack-beaker-centos-7
- puppet-openstack-beaker-bionic - puppet-openstack-beaker-ubuntu-bionic
gate: gate:
jobs: jobs:
- puppet-openstack-beaker-centos-7 - puppet-openstack-beaker-centos-7
- puppet-openstack-beaker-bionic - puppet-openstack-beaker-ubuntu-bionic
- job: - job:
name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7 name: puppet-openstack-libraries-puppet-beaker-rspec-centos-7
@ -629,14 +629,6 @@
- ^LICENSE$ - ^LICENSE$
- ^.gitignore$ - ^.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: - job:
name: puppet-openstack-libraries-puppet-syntax-4-centos-7 name: puppet-openstack-libraries-puppet-syntax-4-centos-7
parent: puppet-openstack-libraries-puppet-syntax parent: puppet-openstack-libraries-puppet-syntax
@ -644,6 +636,13 @@
vars: vars:
puppet: 4 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: - job:
name: puppet-openstack-libraries-puppet-unit-centos-7 name: puppet-openstack-libraries-puppet-unit-centos-7
parent: puppet-openstack-integration-base parent: puppet-openstack-integration-base
@ -668,6 +667,12 @@
vars: vars:
puppet_gem_version: 4.8 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: - job:
name: puppet-openstack-libraries-puppet-unit-latest-centos-7 name: puppet-openstack-libraries-puppet-unit-latest-centos-7
parent: puppet-openstack-libraries-puppet-unit-centos-7 parent: puppet-openstack-libraries-puppet-unit-centos-7
@ -722,18 +727,20 @@
check: check:
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-centos-7 - 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-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-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-unit-latest-centos-7
- 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
gate: gate:
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-centos-7 - 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-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-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-unit-latest-centos-7
- 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