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
commit 9f4a22c771
5 changed files with 3 additions and 13 deletions

View File

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

View File

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

View File

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

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

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