zuul: Clean up zuul files

Changes to legacy-ironic-inspector-jobs.yaml:
  * Create two base jobs:
    * 'ironic-inspector-tox-func-base'
    * 'ironic-inspector-dsvm-base'
  * Put 'irrelevant-files' section into the new base jobs
  * Have 'requirements.txt' no longer be ignored for DSVM jobs
  * Simplify 'required-projects' sections by removing projects that
    are already pulled in by the 'legacy-dsvm-base' job.

Changes to project.yaml:
  * Move 'irrelevant-files' section from project.yaml to
    legacy-ironic-inspector-jobs.yaml
  * Remove 'branches' section from project.yaml as it is not needed.
  * Sort the jobs list

Change-Id: I6ef94a75fc9e1939c46b2939d01478c5a11621c1
This commit is contained in:
John L. Villalovos 2017-11-16 15:02:40 -08:00
parent 8104e33366
commit 4404b7a99f
2 changed files with 45 additions and 99 deletions

View File

@ -1,53 +1,61 @@
# 'func' jobs
- job:
name: ironic-inspector-tox-func-base
parent: legacy-base
required-projects:
- openstack/requirements
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- job: - job:
name: ironic-inspector-tox-func name: ironic-inspector-tox-func
parent: legacy-base parent: ironic-inspector-tox-func-base
run: playbooks/legacy/ironic-inspector-tox-func/run.yaml run: playbooks/legacy/ironic-inspector-tox-func/run.yaml
post-run: playbooks/legacy/ironic-inspector-tox-func/post.yaml post-run: playbooks/legacy/ironic-inspector-tox-func/post.yaml
timeout: 2400 timeout: 2400
required-projects:
- openstack/requirements
- job: - job:
name: ironic-inspector-tox-func3 name: ironic-inspector-tox-func3
parent: legacy-base parent: ironic-inspector-tox-func-base
run: playbooks/legacy/ironic-inspector-tox-func3/run.yaml run: playbooks/legacy/ironic-inspector-tox-func3/run.yaml
post-run: playbooks/legacy/ironic-inspector-tox-func3/post.yaml post-run: playbooks/legacy/ironic-inspector-tox-func3/post.yaml
timeout: 2400 timeout: 2400
# DSVM jobs
- job:
name: ironic-inspector-dsvm-base
parent: legacy-dsvm-base
required-projects: required-projects:
- openstack/requirements - openstack/ironic
- openstack/ironic-inspector
- openstack/ironic-lib
- openstack/ironic-python-agent
- openstack/pyghmi
- openstack/python-ironic-inspector-client
- openstack/python-ironicclient
- openstack/virtualbmc
irrelevant-files:
- ^test-requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
- job: - job:
name: ironic-inspector-grenade-dsvm name: ironic-inspector-grenade-dsvm
parent: legacy-dsvm-base parent: ironic-inspector-dsvm-base
run: playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml run: playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml
post-run: playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml post-run: playbooks/legacy/ironic-inspector-grenade-dsvm/post.yaml
timeout: 10800 timeout: 10800
required-projects: required-projects:
- openstack-dev/grenade - openstack-dev/grenade
- openstack-infra/devstack-gate
- openstack/ironic
- openstack/ironic-inspector
- openstack/ironic-lib
- openstack/ironic-python-agent
- openstack/pyghmi
- openstack/python-ironic-inspector-client
- openstack/python-ironicclient
- openstack/virtualbmc
- job: - job:
name: ironic-inspector-tempest-dsvm-discovery name: ironic-inspector-tempest-dsvm-discovery
parent: legacy-dsvm-base parent: ironic-inspector-dsvm-base
run: playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml run: playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml
post-run: playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/post.yaml post-run: playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/post.yaml
timeout: 10800 timeout: 10800
required-projects:
- openstack-infra/devstack-gate
- openstack/ironic
- openstack/ironic-inspector
- openstack/ironic-lib
- openstack/ironic-python-agent
- openstack/pyghmi
- openstack/python-ironic-inspector-client
- openstack/python-ironicclient
- openstack/tempest
- openstack/virtualbmc

View File

@ -2,77 +2,15 @@
name: openstack/ironic-inspector name: openstack/ironic-inspector
check: check:
jobs: jobs:
- ironic-inspector-tox-func: - ironic-inspector-grenade-dsvm
irrelevant-files: - ironic-inspector-tempest-dsvm-discovery
- ^.*\.rst$ - ironic-inspector-tox-func
- ^doc/.*$ - ironic-inspector-tox-func3
- ironic-inspector-tox-func3: - ironic-tempest-dsvm-ironic-inspector
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ironic-inspector-grenade-dsvm:
branches: ^(?!stable/newton).*$
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
- ironic-inspector-tempest-dsvm-discovery:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
- ironic-tempest-dsvm-ironic-inspector:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
gate: gate:
jobs: jobs:
- ironic-inspector-tox-func: - ironic-inspector-grenade-dsvm
irrelevant-files: - ironic-inspector-tempest-dsvm-discovery
- ^.*\.rst$ - ironic-inspector-tox-func
- ^doc/.*$ - ironic-inspector-tox-func3
- ironic-inspector-tox-func3: - ironic-tempest-dsvm-ironic-inspector
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ironic-inspector-grenade-dsvm:
branches: ^(?!stable/newton).*$
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
- ironic-inspector-tempest-dsvm-discovery:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$
- ironic-tempest-dsvm-ironic-inspector:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^.*\.rst$
- ^doc/.*$
- ^ironic_inspector/test/(?!.*tempest).*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tox.ini$