Merge "zuul: Clean up zuul files"

This commit is contained in:
Zuul 2017-11-22 00:32:06 +00:00 committed by Gerrit Code Review
commit 266be2e63d
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$