openstack/puppet-openstack-integration
Code Issues Proposed changes

Ensure libraries lint running with Bionic

Browse Source 
See failures in [1].

* With [1] the libraries lint job fails because we
  try to use Puppet 6 on CentOS 7 so we need to move
  this job to Bionic, like we did with the module
  lint job.

* Remove unnecessary new lines because of generic cleanup

[1] https://review.openstack.org/#/c/618920/

Change-Id: I4983744bf9143d7fee7a5380bade483f0c55c159
This commit is contained in:
Tobias Urdin 2019-01-16 18:25:53 +01:00
parent 85954db357
commit f4eb502ee5
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:
name: puppet-openstack-integration-base
abstract: true
@ -184,4 +183,3 @@
voting: false
vars:
nodepool_type: bionic

3
zuul.d/beaker.yaml
View File

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

1
zuul.d/integration.yaml
View File

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

4
zuul.d/layout.yaml
View File

@ -28,7 +28,7 @@
name: puppet-openstack-library-jobs
check:
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-5-centos-7
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
@ -40,7 +40,7 @@
- puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
gate:
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-5-centos-7
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic

6
zuul.d/linters.yaml
View File

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