Clean up zuul files
Changes to legacy-bifrost-jobs.yaml: - creates two jobs: - bifrost-base - bifrost-integration - adds 'irrelevant-files' section to bifrost-base (from project.yaml) as well as additional irrelevant files Changes to project.yaml: - moves 'irrelevant-files' section to legacy-bifrost-jobs.yaml - removes branches, since it doesn't apply to master and the stable branches have their own versions of zuul files - removes experimental section (since it was only used for the stable branches) - sorts the jobs list; voting first, alphabetical; non-voting second Change-Id: I514e7e40ecb95580a47922b253d8046cfcd1634c
This commit is contained in:
parent
cc46b9280c
commit
12e6570bba
|
@ -1,12 +1,17 @@
|
|||
- job:
|
||||
name: bifrost-integration-dhcp
|
||||
name: bifrost-base
|
||||
parent: legacy-base
|
||||
run: playbooks/legacy/bifrost-integration-dhcp/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml
|
||||
timeout: 7200
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^bifrost/tests/.*$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- ^setup.cfg$
|
||||
- ^test-requirements.txt$
|
||||
- ^tools/.*$
|
||||
- ^tox.ini$
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
|
@ -14,133 +19,78 @@
|
|||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration
|
||||
parent: bifrost-base
|
||||
required-projects:
|
||||
# this is in addition to bifrost-base's required-projects
|
||||
- openstack/diskimage-builder
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dhcp
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dhcp/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml
|
||||
timeout: 7200
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dhcp-centos-7
|
||||
parent: legacy-base
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml
|
||||
timeout: 7200
|
||||
nodeset: legacy-centos-7
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dhcp-opensuse-423
|
||||
parent: legacy-base
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml
|
||||
timeout: 7200
|
||||
nodeset: legacy-opensuse-423
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dibipa-debian
|
||||
parent: legacy-base
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post.yaml
|
||||
timeout: 7200
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dibipa-debian-centos-7
|
||||
parent: legacy-base
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post.yaml
|
||||
timeout: 7200
|
||||
nodeset: legacy-centos-7
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-dibipa-debian-opensuse-423
|
||||
parent: legacy-base
|
||||
parent: bifrost-integration
|
||||
run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post.yaml
|
||||
timeout: 7200
|
||||
nodeset: legacy-opensuse-423
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/diskimage-builder
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-tinyipa
|
||||
parent: legacy-base
|
||||
parent: bifrost-base
|
||||
run: playbooks/legacy/bifrost-integration-tinyipa/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-tinyipa/post.yaml
|
||||
timeout: 3600
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-tinyipa-centos-7
|
||||
parent: legacy-base
|
||||
parent: bifrost-base
|
||||
run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post.yaml
|
||||
timeout: 3600
|
||||
nodeset: legacy-centos-7
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
||||
- job:
|
||||
name: bifrost-integration-tinyipa-opensuse-423
|
||||
parent: legacy-base
|
||||
parent: bifrost-base
|
||||
run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run.yaml
|
||||
post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post.yaml
|
||||
timeout: 3600
|
||||
nodeset: legacy-opensuse-423
|
||||
required-projects:
|
||||
- openstack/bifrost
|
||||
- openstack/ironic
|
||||
- openstack/ironic-inspector
|
||||
- openstack/python-ironic-inspector-client
|
||||
- openstack/python-ironicclient
|
||||
- openstack/requirements
|
||||
- openstack-infra/shade
|
||||
|
|
|
@ -1,79 +1,25 @@
|
|||
- project:
|
||||
name: openstack/bifrost
|
||||
|
||||
experimental:
|
||||
jobs:
|
||||
- bifrost-integration-tinyipa-opensuse-423:
|
||||
branches: ^(?!stable/ocata).*$
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
check:
|
||||
jobs:
|
||||
- bifrost-integration-tinyipa-centos-7:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dibipa-debian-centos-7:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-tinyipa:
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-tinyipa-opensuse-423:
|
||||
branches: ^(?!stable/ocata).*$
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dibipa-debian:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dibipa-debian-opensuse-423:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-tinyipa
|
||||
- bifrost-integration-tinyipa-opensuse-423
|
||||
# Non-voting jobs
|
||||
- bifrost-integration-dhcp:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dhcp-opensuse-423:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dhcp-centos-7:
|
||||
voting: false
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-dibipa-debian-centos-7:
|
||||
voting: false
|
||||
- bifrost-integration-dibipa-debian:
|
||||
voting: false
|
||||
- bifrost-integration-dibipa-debian-opensuse-423:
|
||||
voting: false
|
||||
- bifrost-integration-tinyipa-centos-7:
|
||||
voting: false
|
||||
gate:
|
||||
jobs:
|
||||
- bifrost-integration-tinyipa:
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-tinyipa-opensuse-423:
|
||||
branches: ^(?!stable/ocata).*$
|
||||
irrelevant-files:
|
||||
- ^.*\.rst$
|
||||
- ^doc/.*$
|
||||
- ^releasenotes/.*$
|
||||
- bifrost-integration-tinyipa
|
||||
- bifrost-integration-tinyipa-opensuse-423
|
||||
|
|
Loading…
Reference in New Issue