openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Ensure libraries lint running with Bionic"

This commit is contained in:
Zuul 2019-01-18 01:55:08 +00:00 committed by Gerrit Code Review
parent a5b22a67fe f4eb502ee5
commit 9f4a22c771
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul.d/base.yaml
View File

@ -1,4 +1,3 @@
- job: - job:
name: puppet-openstack-integration-base name: puppet-openstack-integration-base
abstract: true abstract: true
@ -184,4 +183,3 @@
voting: false voting: false
vars: vars:
nodepool_type: bionic nodepool_type: bionic

3
zuul.d/beaker.yaml
View File

@ -1,4 +1,3 @@
- project-template: - project-template:
name: puppet-openstack-beaker-jobs name: puppet-openstack-beaker-jobs
check: check:
@ -51,5 +50,3 @@
- ^.gitignore$ - ^.gitignore$
vars: vars:
nodepool_type: bionic nodepool_type: bionic

1
zuul.d/integration.yaml
View File

@ -1,5 +1,4 @@
--- ---
- job: - job:
name: puppet-openstack-integration-4 name: puppet-openstack-integration-4
parent: puppet-openstack-integration-run-base parent: puppet-openstack-integration-run-base

4
zuul.d/layout.yaml
View File

@ -28,7 +28,7 @@
name: puppet-openstack-library-jobs name: puppet-openstack-library-jobs
check: check:
jobs: jobs:
- puppet-openstack-libraries-puppet-lint-centos-7 - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
- 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
@ -40,7 +40,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-ubuntu-bionic
- 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

6
zuul.d/linters.yaml
View File

@ -28,12 +28,11 @@
puppet: 6 puppet: 6
- job: - job:
name: puppet-openstack-libraries-puppet-lint-centos-7 name: puppet-openstack-libraries-puppet-lint-ubuntu-bionic
parent: puppet-openstack-integration-base parent: puppet-openstack-integration-base
run: playbooks/run-libraries-lint-tests.yaml run: playbooks/run-libraries-lint-tests.yaml
pre-run: playbooks/prepare-node-unit.yaml pre-run: playbooks/prepare-node-unit.yaml
timeout: 3600 timeout: 3600
nodeset: centos-7
- job: - job:
name: puppet-openstack-libraries-puppet-syntax name: puppet-openstack-libraries-puppet-syntax
@ -69,8 +68,5 @@
- job: - job:
name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-syntax parent: puppet-openstack-libraries-puppet-syntax
nodeset: ubuntu-bionic
vars: vars:
puppet: 6 puppet: 6