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: If09358e8248785cd5683f576f3b7d01aa33a0046
This commit is contained in:
Takashi Kajinami 2020-04-09 23:48:11 +09:00
parent fcf1412240
commit fbfcc8a0fc
6 changed files with 0 additions and 161 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
@ -201,7 +113,6 @@
- job:
name: puppet-openstack-integration-5-scenario004
parent: puppet-openstack-integration-5
branches: ^(?!stable/newton).*$
abstract: true
vars:
scenario: scenario004
@ -245,7 +156,6 @@
name: puppet-openstack-integration-6
parent: puppet-openstack-integration-run-base
abstract: true
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
puppet: 6
@ -330,7 +240,6 @@
- job:
name: puppet-openstack-integration-6-scenario004
parent: puppet-openstack-integration-6
branches: ^(?!stable/newton).*$
abstract: true
vars:
scenario: scenario004

22
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,12 +27,10 @@
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.8-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.4-centos-8
@ -45,10 +41,8 @@
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-6-ubuntu-bionic
- puppet-openstack-libraries-puppet-unit-4.8-centos-7
- puppet-openstack-libraries-puppet-unit-5.5-centos-7
- puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
- puppet-openstack-libraries-puppet-beaker-rspec-centos-7
@ -82,14 +76,6 @@
- puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus
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
@ -121,8 +107,6 @@
- puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
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
@ -142,8 +126,6 @@
- puppet-openstack-integration-5-scenario002-tempest-centos-7
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
@ -162,8 +144,6 @@
- puppet-openstack-integration-5-scenario003-tempest-centos-7
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
@ -182,8 +162,6 @@
- puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus
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

12
zuul.d/libraries.yaml
View File

@ -1,14 +1,6 @@
---
# This file contains the jobs for the puppet openstack libraries
#
- job:
name: puppet-openstack-libraries-puppet-unit-4.8-centos-7
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet_gem_version: 4.8.0
- job:
name: puppet-openstack-libraries-puppet-unit-5.5-centos-7
parent: puppet-openstack-libraries-puppet-unit-base
@ -21,7 +13,6 @@
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-8
voting: false
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 5.5.0
@ -30,14 +21,12 @@
parent: puppet-openstack-libraries-puppet-unit-base
nodeset: centos-8
voting: false
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 6.4.0
- job:
name: puppet-openstack-libraries-puppet-unit-6.4-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-unit-base
branches: ^(stable/stein|master)$
nodeset: ubuntu-bionic
vars:
puppet_gem_version: 6.4.0
@ -45,7 +34,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:

19
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/stein|master)$
vars:
puppet: 6
@ -53,14 +45,6 @@
- ^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
@ -72,7 +56,6 @@
- job:
name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
parent: puppet-openstack-libraries-puppet-syntax
branches: ^(stable/stein|master)$
vars:
puppet: 6
@ -80,7 +63,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 +70,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

2
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/(newton|ocata|pike|queens)).*$
irrelevant-files:
- ^.*\.md$
- ^.*\.rst$

15
zuul.d/unit.yaml
View File

@ -1,14 +1,6 @@
---
# This file contains the puppet unit job configurations
#
- job:
name: puppet-openstack-unit-4.8-centos-7
parent: puppet-openstack-unit-base
nodeset: centos-7
branches: ^stable/(ocata|pike|queens|rocky|stein)$
vars:
puppet_gem_version: 4.8.0
- job:
name: puppet-openstack-unit-5.5-centos-7
parent: puppet-openstack-unit-base
@ -21,7 +13,6 @@
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 +20,6 @@
name: puppet-openstack-unit-6.4-centos-8
parent: puppet-openstack-unit-base
nodeset: centos-8
branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
vars:
puppet_gem_version: 6.4.0
@ -37,7 +27,6 @@
name: puppet-openstack-unit-6.4-ubuntu-bionic
parent: puppet-openstack-unit-base
nodeset: ubuntu-bionic
branches: ^(stable/stein|master)$
vars:
puppet_gem_version: 6.4.0
@ -45,8 +34,6 @@
name: puppet-openstack-unit-latest-ubuntu-bionic
parent: puppet-openstack-unit-base
nodeset: ubuntu-bionic
branches: ^master
voting: false
vars:
puppet_gem_version: latest
# TODO(tobias-urdin): Remove this when we 2.7.1 works without
@ -57,7 +44,6 @@
name: puppet-openstack-module-unit-jobs
check:
jobs:
- puppet-openstack-unit-4.8-centos-7
- puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-5.5-centos-8
- puppet-openstack-unit-6.4-centos-8
@ -65,6 +51,5 @@
- puppet-openstack-unit-latest-ubuntu-bionic
gate:
jobs:
- puppet-openstack-unit-4.8-centos-7
- puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-6.4-ubuntu-bionic