openstack/swift
Code Issues Proposed changes

Clean up centos-7 based jobs

Browse Source 
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:
Elod Illes 2024-04-24 15:35:48 +02:00
parent 8733a60227
commit 11fd2ec0f6
2 changed files with 20 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
.zuul.yaml
View File

@ -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
@ -302,35 +282,15 @@
SERVICE_HOST: "" SERVICE_HOST: ""
- job: - job:
name: swift-tox-func-s3api-ceph-s3tests-tempauth name: swift-probetests-centos-8-stream
parent: unittests parent: unittests
voting: false nodeset: centos-8-stream
nodeset: centos-7
description: |
Setup a SAIO dev environment and run ceph-s3tests
timeout: 5400
vars:
s3_acl: yes
pre-run:
- tools/playbooks/common/install_dependencies.yaml
- tools/playbooks/saio_single_node_setup/setup_saio.yaml
- tools/playbooks/saio_single_node_setup/add_s3api.yaml
- tools/playbooks/saio_single_node_setup/make_rings.yaml
run: tools/playbooks/ceph-s3tests/run.yaml
post-run:
- tools/playbooks/probetests/post.yaml
- tools/playbooks/ceph-s3tests/post.yaml
- job:
name: swift-probetests-centos-7
parent: unittests
nodeset: centos-7
description: | description: |
Setup a SAIO dev environment and run Swift's probe tests Setup a SAIO dev environment and run Swift's probe tests
under Python 2. under Python 3.
timeout: 7200 timeout: 7200
vars: vars:
bindep_profile: test py27 bindep_profile: test py36
pre-run: pre-run:
- tools/playbooks/common/install_dependencies.yaml - tools/playbooks/common/install_dependencies.yaml
- tools/playbooks/saio_single_node_setup/setup_saio.yaml - tools/playbooks/saio_single_node_setup/setup_saio.yaml
@ -338,16 +298,6 @@
run: tools/playbooks/probetests/run.yaml run: tools/playbooks/probetests/run.yaml
post-run: tools/playbooks/probetests/post.yaml post-run: tools/playbooks/probetests/post.yaml
- job:
name: swift-probetests-centos-8-stream
parent: swift-probetests-centos-7
nodeset: centos-8-stream
description: |
Setup a SAIO dev environment and run Swift's probe tests
under Python 3.
vars:
bindep_profile: test py36
- job: - job:
name: swift-probetests-centos-8-stream-arm64 name: swift-probetests-centos-8-stream-arm64
parent: swift-probetests-centos-8-stream parent: swift-probetests-centos-8-stream
@ -362,7 +312,7 @@
- job: - job:
name: swift-func-cors name: swift-func-cors
parent: swift-probetests-centos-7 parent: swift-probetests-centos-8-stream
description: | description: |
Setup a SAIO dev environment and run Swift's CORS functional tests Setup a SAIO dev environment and run Swift's CORS functional tests
timeout: 1200 timeout: 1200
@ -375,18 +325,18 @@
post-run: tools/playbooks/cors/post.yaml post-run: tools/playbooks/cors/post.yaml
- nodeset: - nodeset:
name: swift-five-nodes name: swift-five-nodes-centos8
nodes: nodes:
- name: test-runner1 - name: test-runner1
label: centos-7 label: centos-8-stream
- name: proxy1 - name: proxy1
label: centos-7 label: centos-8-stream
- name: account1 - name: account1
label: centos-7 label: centos-8-stream
- name: container1 - name: container1
label: centos-7 label: centos-8-stream
- name: object1 - name: object1
label: centos-7 label: centos-8-stream
groups: groups:
- name: test-runner - name: test-runner
nodes: nodes:
@ -418,7 +368,7 @@
- job: - job:
name: swift-multinode-rolling-upgrade name: swift-multinode-rolling-upgrade
parent: multinode parent: multinode
nodeset: swift-five-nodes nodeset: swift-five-nodes-centos8
description: | description: |
Build a 4 node swift cluster and run functional tests Build a 4 node swift cluster and run functional tests
timeout: 5400 timeout: 5400
@ -431,47 +381,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-rocky
parent: swift-multinode-rolling-upgrade
vars:
previous_swift_version: origin/stable/rocky
- job:
name: swift-multinode-rolling-upgrade-stein
parent: swift-multinode-rolling-upgrade
vars:
previous_swift_version: origin/stable/stein
- 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
@ -626,7 +552,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:
@ -688,15 +613,13 @@
- ^doc/(requirements.txt|(manpages|source)/.*)$ - ^doc/(requirements.txt|(manpages|source)/.*)$
- ^test/(cors|unit|probe)/.*$ - ^test/(cors|unit|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)/.*$ - ^test/(cors|unit|functional)/.*$
- ^(.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:
@ -720,6 +643,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
@ -740,8 +665,6 @@
- swift-tox-func-encryption-py38 - swift-tox-func-encryption-py38
- swift-tox-func-ec-py38 - swift-tox-func-ec-py38
- swift-func-cors - swift-func-cors
- 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:
@ -754,26 +677,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-py36-centos-8-stream - swift-tox-func-py36-centos-8-stream
- swift-tox-func-encryption-py36-centos-8-stream - swift-tox-func-encryption-py36-centos-8-stream
- swift-tox-func-ec-py36-centos-8-stream - swift-tox-func-ec-py36-centos-8-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

2
tools/playbooks/cors/run.yaml
View File

@ -9,7 +9,7 @@
- name: Run CORS tests - name: Run CORS tests
shell: > shell: >
python python3
{{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/test/cors/main.py {{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/test/cors/main.py
--output {{ ansible_env.HOME }}/cors-test-results.txt --output {{ ansible_env.HOME }}/cors-test-results.txt
all all