zuul: Clean up/de-dupe irrelevant-files

Change-Id: I397834fe00011df5fc161395012ed45afd859c44
This commit is contained in:
Tim Burke 2021-01-27 16:00:36 -08:00 committed by Tim Burke
parent 6bb40f2dfd
commit be908186be
1 changed files with 35 additions and 108 deletions

View File

@ -486,65 +486,42 @@
check: check:
jobs: jobs:
- swift-build-image: - swift-build-image:
irrelevant-files: irrelevant-files: &docker-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$ - ^test/(functional|probe)/.*$
- swift-build-image-py3: - swift-build-image-py3:
irrelevant-files: irrelevant-files: *docker-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
# Unit tests # Unit tests
- swift-tox-py27: - swift-tox-py27:
irrelevant-files: irrelevant-files: &unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$ - ^test/(functional|probe)/.*$
- swift-tox-py36: - swift-tox-py36:
irrelevant-files: irrelevant-files: *unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
- swift-tox-py37: - swift-tox-py37:
irrelevant-files: irrelevant-files: *unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
- swift-tox-py38: - swift-tox-py38:
irrelevant-files: irrelevant-files: *unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
# Functional tests # Functional tests
- swift-tox-func-py27: - swift-tox-func-py27:
irrelevant-files: irrelevant-files: &functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$ - ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-func-encryption-py27: - swift-tox-func-encryption-py27:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-func-ec-py27: - swift-tox-func-ec-py27:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
# py3 functional tests # py3 functional tests
- swift-tox-func-py37: - swift-tox-func-py37:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-func-encryption-py37: - swift-tox-func-encryption-py37:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-func-ec-py37: - swift-tox-func-ec-py37:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
# Other tests # Other tests
- swift-tox-func-s3api-ceph-s3tests-tempauth: - swift-tox-func-s3api-ceph-s3tests-tempauth:
@ -556,67 +533,47 @@
- ^test/(unit|probe)/.*$ - ^test/(unit|probe)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-probetests-centos-7: - swift-probetests-centos-7:
irrelevant-files: irrelevant-files: &probetest-irrelevant-files
- ^(api-ref|releasenotes)/.*$ - ^(api-ref|releasenotes)/.*$
# Keep doc/saio -- we use those sample configs in the saio playbooks # Keep doc/saio -- we use those sample configs in the saio playbooks
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$ - ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
- ^test/(unit|functional)/.*$ - ^test/(unit|functional)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-probetests-centos-8: - swift-probetests-centos-8:
irrelevant-files: irrelevant-files: *probetest-irrelevant-files
- ^(api-ref|releasenotes)/.*$
# Keep doc/saio -- we use those sample configs in the saio playbooks
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
- ^test/(unit|functional)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-dsvm-functional: - swift-dsvm-functional:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-dsvm-functional-ipv6: - swift-dsvm-functional-ipv6:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-lower-constraints: - swift-tox-lower-constraints:
irrelevant-files: irrelevant-files: *unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
- openstack-tox-pep8: - openstack-tox-pep8:
irrelevant-files: irrelevant-files: &pep8-irrelevant-files
- ^(api-ref|etc|examples|releasenotes)/.*$ - ^(api-ref|etc|examples|releasenotes)/.*$
# Keep doc/manpages -- we want to syntax check them # Keep doc/manpages -- we want to syntax check them
- ^doc/(requirements.txt|(saio|s3api|source)/.*)$ - ^doc/(requirements.txt|(saio|s3api|source)/.*)$
- swift-multinode-rolling-upgrade: - swift-multinode-rolling-upgrade:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
voting: false voting: false
- tempest-integrated-object-storage: - tempest-integrated-object-storage:
irrelevant-files: irrelevant-files: &tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$ - ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- tempest-ipv6-only: - tempest-ipv6-only:
irrelevant-files: irrelevant-files: *tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- grenade: - grenade:
irrelevant-files: irrelevant-files: *tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
gate: gate:
jobs: jobs:
# For gate jobs, err towards running more jobs (so, generally avoid # For gate jobs, err towards running more jobs (so, generally avoid
# using irrelevant-files). Exceptions should mainly be made for # using irrelevant-files). Exceptions should mainly be made for
# long-running jobs, like probetests or (once they move to # long-running jobs, like probetests or (once they move to
# in-tree definitions) dsvm jobs. # in-tree definitions) dsvm jobs.
- swift-upload-image - swift-upload-image:
- swift-upload-image-py3 irrelevant-files: *docker-irrelevant-files
- swift-upload-image-py3:
irrelevant-files: *docker-irrelevant-files
- swift-tox-py27 - swift-tox-py27
- swift-tox-py36 - swift-tox-py36
- swift-tox-py37 - swift-tox-py37
@ -628,53 +585,23 @@
- swift-tox-func-encryption-py37 - swift-tox-func-encryption-py37
- swift-tox-func-ec-py37 - swift-tox-func-ec-py37
- swift-probetests-centos-7: - swift-probetests-centos-7:
irrelevant-files: irrelevant-files: *probetest-irrelevant-files
- ^(api-ref|releasenotes)/.*$
# Keep doc/saio -- we use those sample configs in the saio playbooks
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
- ^test/(unit|functional)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-probetests-centos-8: - swift-probetests-centos-8:
irrelevant-files: irrelevant-files: *probetest-irrelevant-files
- ^(api-ref|releasenotes)/.*$
# Keep doc/saio -- we use those sample configs in the saio playbooks
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
- ^test/(unit|functional)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-dsvm-functional: - swift-dsvm-functional:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-dsvm-functional-ipv6: - swift-dsvm-functional-ipv6:
irrelevant-files: irrelevant-files: *functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/probe/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-lower-constraints: - swift-tox-lower-constraints:
irrelevant-files: irrelevant-files: *unittest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/(functional|probe)/.*$
- openstack-tox-pep8: - openstack-tox-pep8:
irrelevant-files: irrelevant-files: *pep8-irrelevant-files
- ^(api-ref|etc|examples|releasenotes)/.*$
# Keep doc/manpages -- we want to syntax check them
- ^doc/(requirements.txt|(saio|s3api|source)/.*)$
- tempest-integrated-object-storage: - tempest-integrated-object-storage:
irrelevant-files: irrelevant-files: *tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- tempest-ipv6-only: - tempest-ipv6-only:
irrelevant-files: irrelevant-files: *tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- grenade: - grenade:
irrelevant-files: irrelevant-files: *tempest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$
- ^test/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
experimental: experimental:
jobs: jobs:
- swift-tox-py27-centos-7 - swift-tox-py27-centos-7