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 experimental section since the job is voting
- sorts the jobs list; voting first, alphabetical; non-voting second

Conflicts:
  zuul.d/project.yaml

Change-Id: I514e7e40ecb95580a47922b253d8046cfcd1634c
(cherry picked from commit 12e6570bba)
This commit is contained in:
Ruby Loo 2017-11-21 14:14:51 -05:00
parent 10dd56209b
commit 3cef59a0c5
2 changed files with 45 additions and 146 deletions

View File

@ -1,12 +1,17 @@
- job: - job:
name: bifrost-integration-dhcp name: bifrost-base
parent: legacy-base parent: legacy-base
run: playbooks/legacy/bifrost-integration-dhcp/run.yaml irrelevant-files:
post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml - ^.*\.rst$
timeout: 7200 - ^bifrost/tests/.*$
- ^doc/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^test-requirements.txt$
- ^tools/.*$
- ^tox.ini$
required-projects: required-projects:
- openstack/bifrost - openstack/bifrost
- openstack/diskimage-builder
- openstack/ironic - openstack/ironic
- openstack/ironic-inspector - openstack/ironic-inspector
- openstack/python-ironic-inspector-client - openstack/python-ironic-inspector-client
@ -14,133 +19,78 @@
- openstack/requirements - openstack/requirements
- openstack-infra/shade - 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: - job:
name: bifrost-integration-dhcp-centos-7 name: bifrost-integration-dhcp-centos-7
parent: legacy-base parent: bifrost-integration
run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml
post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml
timeout: 7200 timeout: 7200
nodeset: legacy-centos-7 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: - job:
name: bifrost-integration-dhcp-opensuse-423 name: bifrost-integration-dhcp-opensuse-423
parent: legacy-base parent: bifrost-integration
run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml
post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml
timeout: 7200 timeout: 7200
nodeset: legacy-opensuse-423 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: - job:
name: bifrost-integration-dibipa-debian name: bifrost-integration-dibipa-debian
parent: legacy-base parent: bifrost-integration
run: playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml run: playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post.yaml post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post.yaml
timeout: 7200 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: - job:
name: bifrost-integration-dibipa-debian-centos-7 name: bifrost-integration-dibipa-debian-centos-7
parent: legacy-base parent: bifrost-integration
run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run.yaml run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run.yaml
post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post.yaml post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post.yaml
timeout: 7200 timeout: 7200
nodeset: legacy-centos-7 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: - job:
name: bifrost-integration-dibipa-debian-opensuse-423 name: bifrost-integration-dibipa-debian-opensuse-423
parent: legacy-base parent: bifrost-integration
run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run.yaml run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run.yaml
post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post.yaml post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post.yaml
timeout: 7200 timeout: 7200
nodeset: legacy-opensuse-423 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: - job:
name: bifrost-integration-tinyipa name: bifrost-integration-tinyipa
parent: legacy-base parent: bifrost-base
run: playbooks/legacy/bifrost-integration-tinyipa/run.yaml run: playbooks/legacy/bifrost-integration-tinyipa/run.yaml
post-run: playbooks/legacy/bifrost-integration-tinyipa/post.yaml post-run: playbooks/legacy/bifrost-integration-tinyipa/post.yaml
timeout: 3600 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: - job:
name: bifrost-integration-tinyipa-centos-7 name: bifrost-integration-tinyipa-centos-7
parent: legacy-base parent: bifrost-base
run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run.yaml run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run.yaml
post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post.yaml post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post.yaml
timeout: 3600 timeout: 3600
nodeset: legacy-centos-7 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: - job:
name: bifrost-integration-tinyipa-opensuse-423 name: bifrost-integration-tinyipa-opensuse-423
parent: legacy-base parent: bifrost-base
run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run.yaml run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run.yaml
post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post.yaml post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post.yaml
timeout: 3600 timeout: 3600
nodeset: legacy-opensuse-423 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

View File

@ -1,76 +1,25 @@
- project: - project:
name: openstack/bifrost name: openstack/bifrost
experimental:
jobs:
- bifrost-integration-tinyipa-opensuse-423:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
check: check:
jobs: jobs:
- bifrost-integration-tinyipa-centos-7: - bifrost-integration-tinyipa
voting: false - bifrost-integration-tinyipa-opensuse-423
irrelevant-files: # Non-voting jobs
- ^.*\.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:
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-dhcp: - bifrost-integration-dhcp:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- bifrost-integration-dhcp-opensuse-423: - bifrost-integration-dhcp-opensuse-423:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- bifrost-integration-dhcp-centos-7: - bifrost-integration-dhcp-centos-7:
voting: false voting: false
irrelevant-files: - bifrost-integration-dibipa-debian-centos-7:
- ^.*\.rst$ voting: false
- ^doc/.*$ - bifrost-integration-dibipa-debian:
- ^releasenotes/.*$ voting: false
- bifrost-integration-dibipa-debian-opensuse-423:
voting: false
- bifrost-integration-tinyipa-centos-7:
voting: false
gate: gate:
jobs: jobs:
- bifrost-integration-tinyipa: - bifrost-integration-tinyipa
irrelevant-files: - bifrost-integration-tinyipa-opensuse-423
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- bifrost-integration-tinyipa-opensuse-423:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$