openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Remove all branches filter in zuul configuration 

... to avoid conflict between stable branches, because adding branches
make that job definition global one instead of branch specific one[1].

[1] https://zuul-ci.org/docs/zuul/reference/job_def.html#attr-job.branches

Closes-Bug: #1871866
Change-Id: I4224ab2ca2d66cab1ba596760c6bb594ad1ce098
This commit is contained in:
Takashi Kajinami 2020-04-09 23:39:16 +09:00
parent 7f8956b399
commit 918e548b5c
6 changed files with 0 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
zuul.d/integration.yaml
View File

@ -1,96 +1,8 @@
---
- job:
name: puppet-openstack-integration-4
parent: puppet-openstack-integration-run-base
abstract: true
vars:
puppet: 4
- job:
name: puppet-openstack-integration-4-scenario001
parent: puppet-openstack-integration-4
abstract: true
vars:
scenario: scenario001
ceph: luminous
- job:
name: puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous
parent: puppet-openstack-integration-4-scenario001
branches: ^stable/(newton|ocata|pike|queens).*$
nodeset: centos-7
- job:
name: puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous
parent: puppet-openstack-integration-4-scenario001
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
nodeset: debian-stable
- job:
name: puppet-openstack-integration-4-scenario002
parent: puppet-openstack-integration-4
abstract: true
vars:
scenario: scenario002
- job:
name: puppet-openstack-integration-4-scenario002-tempest-centos-7
parent: puppet-openstack-integration-4-scenario002
branches: ^stable/(newton|ocata|pike|queens).*$
nodeset: centos-7
- job:
name: puppet-openstack-integration-4-scenario002-tempest-debian-stable
parent: puppet-openstack-integration-4-scenario002
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
nodeset: debian-stable
- job:
name: puppet-openstack-integration-4-scenario003
parent: puppet-openstack-integration-4
abstract: true
vars:
scenario: scenario003
- job:
name: puppet-openstack-integration-4-scenario003-tempest-centos-7
parent: puppet-openstack-integration-4-scenario003
branches: ^stable/(newton|ocata|pike|queens).*$
nodeset: centos-7
- job:
name: puppet-openstack-integration-4-scenario003-tempest-debian-stable
parent: puppet-openstack-integration-4-scenario003
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
nodeset: debian-stable
- job:
name: puppet-openstack-integration-4-scenario004
parent: puppet-openstack-integration-4
abstract: true
vars:
scenario: scenario004
ceph: mimic
- job:
name: puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic
parent: puppet-openstack-integration-4-scenario004
branches: ^(stable/(ocata|pike|queens)).*$
nodeset: centos-7
- job:
name: puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous
parent: puppet-openstack-integration-4-scenario004
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
nodeset: debian-stable
vars:
ceph: luminous
- job:
name: puppet-openstack-integration-5
parent: puppet-openstack-integration-run-base
abstract: true
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
puppet: 5
@ -177,7 +89,6 @@
- job:
name: puppet-openstack-integration-5-scenario004
parent: puppet-openstack-integration-5
branches: ^(?!stable/newton).*$
abstract: true
vars:
scenario: scenario004
@ -209,7 +120,6 @@
name: puppet-openstack-integration-6
parent: puppet-openstack-integration-run-base
abstract: true
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
puppet: 6
@ -294,7 +204,6 @@
- job:
name: puppet-openstack-integration-6-scenario004
parent: puppet-openstack-integration-6
branches: ^(?!stable/newton).*$
abstract: true
vars:
scenario: scenario004

26
zuul.d/layout.yaml
View File

@ -8,13 +8,11 @@
check:
jobs:
- puppet-openstack-lint-ubuntu-bionic
- puppet-openstack-syntax-4-ubuntu-bionic
- puppet-openstack-syntax-5-ubuntu-bionic
- puppet-openstack-syntax-6-ubuntu-bionic
gate:
jobs:
- puppet-openstack-lint-ubuntu-bionic
- puppet-openstack-syntax-4-ubuntu-bionic
- puppet-openstack-syntax-5-ubuntu-bionic
- puppet-openstack-syntax-6-ubuntu-bionic
@ -29,13 +27,9 @@
check:
jobs:
- 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-5-centos-8
- puppet-openstack-libraries-puppet-syntax-6-centos-8
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
- 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-8
- puppet-openstack-libraries-puppet-unit-6.11-centos-8
- puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
@ -45,13 +39,9 @@
gate:
jobs:
- 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-5-centos-8
- puppet-openstack-libraries-puppet-syntax-6-centos-8
- puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
- 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-8
- puppet-openstack-libraries-puppet-unit-6.11-centos-8
- puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
@ -78,14 +68,6 @@
- puppet-openstack-integration-5-scenario004-tempest-centos-8
experimental:
jobs:
- puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
voting: false
- puppet-openstack-integration-4-scenario002-tempest-debian-stable:
voting: false
- puppet-openstack-integration-4-scenario003-tempest-debian-stable:
voting: false
- puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
voting: false
- puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
- puppet-openstack-integration-5-scenario002-tempest-debian-stable
- puppet-openstack-integration-5-scenario003-tempest-debian-stable
@ -115,8 +97,6 @@
- puppet-openstack-integration-5-scenario001-tempest-centos-8
experimental:
jobs:
- puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous:
voting: false
- puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous
- puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
- puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic
@ -134,8 +114,6 @@
- puppet-openstack-integration-5-scenario002-tempest-centos-8
experimental:
jobs:
- puppet-openstack-integration-4-scenario002-tempest-debian-stable:
voting: false
- puppet-openstack-integration-5-scenario002-tempest-debian-stable
- puppet-openstack-integration-6-scenario002-tempest-debian-stable
- puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic
@ -152,8 +130,6 @@
- puppet-openstack-integration-5-scenario003-tempest-centos-8
experimental:
jobs:
- puppet-openstack-integration-4-scenario003-tempest-debian-stable:
voting: false
- puppet-openstack-integration-5-scenario003-tempest-debian-stable
- puppet-openstack-integration-6-scenario003-tempest-debian-stable
- puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic
@ -170,8 +146,6 @@
- puppet-openstack-integration-5-scenario004-tempest-centos-8
experimental:
jobs:
- puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous:
voting: false
- puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous
- puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
- puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic

20
zuul.d/libraries.yaml
View File

@ -1,27 +1,10 @@
---
# This file contains the jobs for the puppet openstack libraries
#
- job:
name: puppet-openstack-libraries-puppet-unit-4.10-centos-7
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet_gem_version: 4.10.0
- job:
name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
parent: puppet-openstack-libraries-puppet-unit-base
branches: ^stable/(ocata|pike|queens|rocky|stein|train)$
nodeset: centos-7
vars:
puppet_gem_version: 5.5.0
- job:
name: puppet-openstack-libraries-puppet-unit-5.5-centos-8
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 5.5.0
@ -29,14 +12,12 @@
name: puppet-openstack-libraries-puppet-unit-6.11-centos-8
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 6.11.0
- job:
name: puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-unit-base
branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
nodeset: ubuntu-bionic
vars:
puppet_gem_version: 6.11.0
@ -44,7 +25,6 @@
- job:
name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-unit-base
branches: ^master
nodeset: ubuntu-bionic
voting: false
vars:

27
zuul.d/linters.yaml
View File

@ -9,13 +9,6 @@
- ^requirements.txt$
- ^test-requirements.txt$
- job:
name: puppet-openstack-syntax-4-ubuntu-bionic
parent: puppet-openstack-syntax-base
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet: 4
- job:
name: puppet-openstack-syntax-5-ubuntu-bionic
parent: puppet-openstack-syntax-base
@ -25,7 +18,6 @@
- job:
name: puppet-openstack-syntax-6-ubuntu-bionic
parent: puppet-openstack-syntax-base
branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
vars:
puppet: 6
@ -53,26 +45,9 @@
- ^LICENSE$
- ^.gitignore$
- job:
name: puppet-openstack-libraries-puppet-syntax-4-centos-7
parent: puppet-openstack-libraries-puppet-syntax
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet: 4
- job:
name: puppet-openstack-libraries-puppet-syntax-5-centos-7
parent: puppet-openstack-libraries-puppet-syntax
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein|train)$
vars:
puppet: 5
- job:
name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-syntax
branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
vars:
puppet: 6
@ -80,7 +55,6 @@
name: puppet-openstack-libraries-puppet-syntax-5-centos-8
parent: puppet-openstack-libraries-puppet-syntax
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet: 5
@ -88,6 +62,5 @@
name: puppet-openstack-libraries-puppet-syntax-6-centos-8
parent: puppet-openstack-libraries-puppet-syntax
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet: 6

3
zuul.d/tripleo.yaml
View File

@ -4,7 +4,6 @@
- job:
name: tripleo-puppet-ci-centos-7-undercloud-containers
parent: tripleo-ci-centos-7-undercloud-containers
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
irrelevant-files:
- ^.*\.md$
- ^.*\.rst$
@ -30,7 +29,6 @@
- job:
name: tripleo-puppet-ci-centos-7-standalone
parent: tripleo-ci-centos-7-standalone
branches: ^(stable/(rocky|stein|train)).*$
irrelevant-files: &standalone_irrelevant_files
- ^.*\.md$
- ^.*\.rst$
@ -47,7 +45,6 @@
- job:
name: tripleo-puppet-ci-centos-8-standalone
parent: tripleo-ci-centos-8-standalone
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein|train)).*$
irrelevant-files: *standalone_irrelevant_files
- project-template:

23
zuul.d/unit.yaml
View File

@ -1,27 +1,10 @@
---
# This file contains the puppet unit job configurations
#
- job:
name: puppet-openstack-unit-4.10-centos-7
parent: puppet-openstack-unit-base
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet_gem_version: 4.10.0
- job:
name: puppet-openstack-unit-5.5-centos-7
parent: puppet-openstack-unit-base
branches: ^stable/(ocata|pike|queens|rocky|stein|train)$
nodeset: centos-7
vars:
puppet_gem_version: 5.5.0
- job:
name: puppet-openstack-unit-5.5-centos-8
parent: puppet-openstack-unit-base
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 5.5.0
@ -29,7 +12,6 @@
name: puppet-openstack-unit-6.11-centos-8
parent: puppet-openstack-unit-base
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 6.11.0
@ -37,7 +19,6 @@
name: puppet-openstack-unit-6.11-ubuntu-bionic
parent: puppet-openstack-unit-base
nodeset: ubuntu-bionic
branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
vars:
puppet_gem_version: 6.11.0
@ -57,16 +38,12 @@
name: puppet-openstack-module-unit-jobs
check:
jobs:
- puppet-openstack-unit-4.10-centos-7
- puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-5.5-centos-8
- puppet-openstack-unit-6.11-centos-8
- puppet-openstack-unit-6.11-ubuntu-bionic
- puppet-openstack-unit-latest-ubuntu-bionic
gate:
jobs:
- puppet-openstack-unit-4.10-centos-7
- puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-5.5-centos-8
- puppet-openstack-unit-6.11-centos-8
- puppet-openstack-unit-6.11-ubuntu-bionic