Clean up centos-7 based jobs
There is no Centos-7 nodeset anymore, so let's get rid of those jobs,
or use centos-8-stream if possible. Also remove old rolling upgrade
jobs that would run against branches that are already End of Life.
Grenade job is currently broken, let's remove it from gate and set it
non-voting on check queue to unblock gate. Grenade is part of the
integrated-gate-object-storage template [1], so that has to be removed
and its jobs have to be added explicitly (definition of job
tempest-integrated-object-storage is already re-defined (overriden),
but openstacksdk-functional-devstack has to be added).
[1] 1c3fc43c9d/zuul.d/integrated-gate.yaml
Change-Id: Id56057262fc37add3a47c50946067f8c873c7515
This commit is contained in:
74
.zuul.yaml
74
.zuul.yaml
@@ -27,11 +27,6 @@
|
|||||||
NOSE_COVER_HTML_DIR: '{toxinidir}/cover'
|
NOSE_COVER_HTML_DIR: '{toxinidir}/cover'
|
||||||
post-run: tools/playbooks/common/cover-post.yaml
|
post-run: tools/playbooks/common/cover-post.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-py27-centos-7
|
|
||||||
parent: swift-tox-py27
|
|
||||||
nodeset: centos-7
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-py36
|
name: swift-tox-py36
|
||||||
parent: swift-tox-base
|
parent: swift-tox-base
|
||||||
@@ -223,11 +218,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-ec-py3
|
tox_envlist: func-ec-py3
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-py27-centos-7
|
|
||||||
parent: swift-tox-func-py27
|
|
||||||
nodeset: centos-7
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-func-encryption-py27
|
name: swift-tox-func-encryption-py27
|
||||||
parent: swift-tox-base
|
parent: swift-tox-base
|
||||||
@@ -240,11 +230,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-encryption
|
tox_envlist: func-encryption
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-encryption-py27-centos-7
|
|
||||||
parent: swift-tox-func-encryption-py27
|
|
||||||
nodeset: centos-7
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-func-ec-py27
|
name: swift-tox-func-ec-py27
|
||||||
parent: swift-tox-base
|
parent: swift-tox-base
|
||||||
@@ -257,11 +242,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-ec
|
tox_envlist: func-ec
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-ec-py27-centos-7
|
|
||||||
parent: swift-tox-func-ec-py27
|
|
||||||
nodeset: centos-7
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-dsvm-functional
|
name: swift-dsvm-functional
|
||||||
parent: devstack-minimal
|
parent: devstack-minimal
|
||||||
@@ -343,22 +323,6 @@
|
|||||||
post-run:
|
post-run:
|
||||||
- tools/playbooks/probetests/post.yaml
|
- tools/playbooks/probetests/post.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-probetests-centos-7
|
|
||||||
parent: swift-probetests-centos-8-stream
|
|
||||||
nodeset: centos-7
|
|
||||||
description: |
|
|
||||||
Setup a SAIO dev environment and run Swift's probe tests
|
|
||||||
under Python 2.
|
|
||||||
vars:
|
|
||||||
bindep_profile: test py27
|
|
||||||
ensure_pip_from_packages: False
|
|
||||||
ensure_pip_from_packages_with_python2: False
|
|
||||||
ensure_pip_from_upstream: True
|
|
||||||
ensure_pip_from_upstream_interpreters:
|
|
||||||
- python2
|
|
||||||
ensure_pip_from_upstream_url: "https://bootstrap.pypa.io/pip/2.7/get-pip.py"
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-probetests-centos-8-stream
|
name: swift-probetests-centos-8-stream
|
||||||
parent: unittests
|
parent: unittests
|
||||||
@@ -461,35 +425,23 @@
|
|||||||
run: tools/playbooks/multinode_setup/run.yaml
|
run: tools/playbooks/multinode_setup/run.yaml
|
||||||
post-run: tools/playbooks/probetests/post.yaml
|
post-run: tools/playbooks/probetests/post.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-multinode-rolling-upgrade-train
|
|
||||||
parent: swift-multinode-rolling-upgrade
|
|
||||||
vars:
|
|
||||||
previous_swift_version: origin/stable/train
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-multinode-rolling-upgrade-ussuri
|
|
||||||
parent: swift-multinode-rolling-upgrade
|
|
||||||
vars:
|
|
||||||
previous_swift_version: origin/stable/ussuri
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-multinode-rolling-upgrade-victoria
|
name: swift-multinode-rolling-upgrade-victoria
|
||||||
parent: swift-multinode-rolling-upgrade
|
parent: swift-multinode-rolling-upgrade
|
||||||
vars:
|
vars:
|
||||||
previous_swift_version: origin/stable/victoria
|
previous_swift_version: origin/unmaintained/victoria
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-multinode-rolling-upgrade-wallaby
|
name: swift-multinode-rolling-upgrade-wallaby
|
||||||
parent: swift-multinode-rolling-upgrade
|
parent: swift-multinode-rolling-upgrade
|
||||||
vars:
|
vars:
|
||||||
previous_swift_version: origin/stable/wallaby
|
previous_swift_version: origin/unmaintained/wallaby
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-multinode-rolling-upgrade-xena
|
name: swift-multinode-rolling-upgrade-xena
|
||||||
parent: swift-multinode-rolling-upgrade
|
parent: swift-multinode-rolling-upgrade
|
||||||
vars:
|
vars:
|
||||||
previous_swift_version: origin/stable/xena
|
previous_swift_version: origin/unmaintained/xena
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-multinode-rolling-upgrade-master
|
name: swift-multinode-rolling-upgrade-master
|
||||||
@@ -643,7 +595,6 @@
|
|||||||
- periodic-stable-jobs
|
- periodic-stable-jobs
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
- integrated-gate-object-storage
|
|
||||||
- swift-jobs-arm64
|
- swift-jobs-arm64
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
@@ -712,15 +663,13 @@
|
|||||||
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
||||||
- ^test/(cors|unit|functional|probe)/.*$
|
- ^test/(cors|unit|functional|probe)/.*$
|
||||||
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
||||||
- swift-probetests-centos-7:
|
- swift-probetests-centos-8-stream:
|
||||||
irrelevant-files: &probetest-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/(cors|unit|functional|s3api)/.*$
|
- ^test/(cors|unit|functional|s3api)/.*$
|
||||||
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
||||||
- swift-probetests-centos-8-stream:
|
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
|
||||||
- swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
irrelevant-files: *functest-irrelevant-files
|
irrelevant-files: *functest-irrelevant-files
|
||||||
- swift-dsvm-functional-ipv6:
|
- swift-dsvm-functional-ipv6:
|
||||||
@@ -744,6 +693,8 @@
|
|||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
- grenade:
|
- grenade:
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
|
voting: false
|
||||||
|
- openstacksdk-functional-devstack
|
||||||
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
|
||||||
@@ -765,8 +716,6 @@
|
|||||||
- swift-tox-func-ec-py38
|
- swift-tox-func-ec-py38
|
||||||
- swift-func-cors
|
- swift-func-cors
|
||||||
- swift-tox-func-s3api-tests-tempauth
|
- swift-tox-func-s3api-tests-tempauth
|
||||||
- swift-probetests-centos-7:
|
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
|
||||||
- swift-probetests-centos-8-stream:
|
- swift-probetests-centos-8-stream:
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
irrelevant-files: *probetest-irrelevant-files
|
||||||
- swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
@@ -779,26 +728,17 @@
|
|||||||
irrelevant-files: *pep8-irrelevant-files
|
irrelevant-files: *pep8-irrelevant-files
|
||||||
- tempest-integrated-object-storage:
|
- tempest-integrated-object-storage:
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
|
- openstacksdk-functional-devstack
|
||||||
- tempest-ipv6-only:
|
- tempest-ipv6-only:
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
irrelevant-files: *tempest-irrelevant-files
|
||||||
- grenade:
|
|
||||||
irrelevant-files: *tempest-irrelevant-files
|
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
- swift-tox-py37
|
- swift-tox-py37
|
||||||
- swift-tox-py38
|
- swift-tox-py38
|
||||||
- swift-tox-py27-centos-7
|
|
||||||
- swift-tox-func-py27-centos-7
|
|
||||||
- swift-tox-func-encryption-py27-centos-7
|
|
||||||
- swift-tox-func-ec-py27-centos-7
|
|
||||||
- swift-tox-py36-centos-8-stream
|
- swift-tox-py36-centos-8-stream
|
||||||
- swift-tox-func-py39-centos-9-stream
|
- swift-tox-func-py39-centos-9-stream
|
||||||
- swift-tox-func-encryption-py39-centos-9-stream
|
- swift-tox-func-encryption-py39-centos-9-stream
|
||||||
- swift-tox-func-ec-py39-centos-9-stream
|
- swift-tox-func-ec-py39-centos-9-stream
|
||||||
- swift-multinode-rolling-upgrade-rocky
|
|
||||||
- swift-multinode-rolling-upgrade-stein
|
|
||||||
- swift-multinode-rolling-upgrade-train
|
|
||||||
- swift-multinode-rolling-upgrade-ussuri
|
|
||||||
- swift-multinode-rolling-upgrade-victoria
|
- swift-multinode-rolling-upgrade-victoria
|
||||||
- swift-multinode-rolling-upgrade-wallaby
|
- swift-multinode-rolling-upgrade-wallaby
|
||||||
- swift-multinode-rolling-upgrade-xena
|
- swift-multinode-rolling-upgrade-xena
|
||||||
|
Reference in New Issue
Block a user