From 8c4f9526ac62ee23e60f714d9bb806589db6d8a2 Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Wed, 24 Apr 2024 15:35:48 +0200 Subject: [PATCH] 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] https://opendev.org/openstack/tempest/src/commit/1c3fc43c9dae274a19683b003f78b5f50edbc062/zuul.d/integrated-gate.yaml Conflicts: .zuul.yaml Change-Id: Id56057262fc37add3a47c50946067f8c873c7515 (cherry picked from commit 6728927a38ed77818fb17b12ec0e7bc5a6dbece4) --- .zuul.yaml | 116 ++++------------------------------ tools/playbooks/cors/run.yaml | 2 +- 2 files changed, 15 insertions(+), 103 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 9cd219cd3e..480abe3796 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -27,11 +27,6 @@ NOSE_COVER_HTML_DIR: '{toxinidir}/cover' post-run: tools/playbooks/common/cover-post.yaml -- job: - name: swift-tox-py27-centos-7 - parent: swift-tox-py27 - nodeset: centos-7 - - job: name: swift-tox-py36 parent: swift-tox-base @@ -223,11 +218,6 @@ vars: tox_envlist: func-ec-py3 -- job: - name: swift-tox-func-py27-centos-7 - parent: swift-tox-func-py27 - nodeset: centos-7 - - job: name: swift-tox-func-encryption-py27 parent: swift-tox-base @@ -240,11 +230,6 @@ vars: tox_envlist: func-encryption -- job: - name: swift-tox-func-encryption-py27-centos-7 - parent: swift-tox-func-encryption-py27 - nodeset: centos-7 - - job: name: swift-tox-func-ec-py27 parent: swift-tox-base @@ -257,11 +242,6 @@ vars: tox_envlist: func-ec -- job: - name: swift-tox-func-ec-py27-centos-7 - parent: swift-tox-func-ec-py27 - nodeset: centos-7 - - job: name: swift-dsvm-functional parent: devstack-minimal @@ -305,35 +285,15 @@ SERVICE_HOST: "" - job: - name: swift-tox-func-s3api-ceph-s3tests-tempauth + name: swift-probetests-centos-8-stream parent: unittests - voting: false - 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 + nodeset: centos-8-stream description: | Setup a SAIO dev environment and run Swift's probe tests - under Python 2. + under Python 3. timeout: 7200 vars: - bindep_profile: test py27 + bindep_profile: test py36 pre-run: - tools/playbooks/common/install_dependencies.yaml - tools/playbooks/saio_single_node_setup/setup_saio.yaml @@ -341,16 +301,6 @@ run: tools/playbooks/probetests/run.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: name: swift-probetests-centos-8-stream-arm64 parent: swift-probetests-centos-8-stream @@ -364,7 +314,7 @@ - job: name: swift-func-cors - parent: swift-probetests-centos-7 + parent: swift-probetests-centos-8-stream description: | Setup a SAIO dev environment and run Swift's CORS functional tests timeout: 1200 @@ -377,18 +327,18 @@ post-run: tools/playbooks/cors/post.yaml - nodeset: - name: swift-five-nodes + name: swift-five-nodes-centos8 nodes: - name: test-runner1 - label: centos-7 + label: centos-8-stream - name: proxy1 - label: centos-7 + label: centos-8-stream - name: account1 - label: centos-7 + label: centos-8-stream - name: container1 - label: centos-7 + label: centos-8-stream - name: object1 - label: centos-7 + label: centos-8-stream groups: - name: test-runner nodes: @@ -420,7 +370,7 @@ - job: name: swift-multinode-rolling-upgrade parent: multinode - nodeset: swift-five-nodes + nodeset: swift-five-nodes-centos8 description: | Build a 4 node swift cluster and run functional tests timeout: 5400 @@ -433,30 +383,6 @@ run: tools/playbooks/multinode_setup/run.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: name: swift-multinode-rolling-upgrade-victoria parent: swift-multinode-rolling-upgrade @@ -620,7 +546,6 @@ - periodic-stable-jobs - check-requirements - release-notes-jobs-python3 - - integrated-gate-object-storage - swift-jobs-arm64 check: jobs: @@ -686,15 +611,13 @@ - ^doc/(requirements.txt|(manpages|source)/.*)$ - ^test/(cors|unit|probe)/.*$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - - swift-probetests-centos-7: + - swift-probetests-centos-8-stream: 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/(cors|unit|functional)/.*$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - - swift-probetests-centos-8-stream: - irrelevant-files: *probetest-irrelevant-files - swift-dsvm-functional: irrelevant-files: *functest-irrelevant-files - swift-dsvm-functional-ipv6: @@ -718,6 +641,7 @@ irrelevant-files: *tempest-irrelevant-files - grenade: irrelevant-files: *tempest-irrelevant-files + voting: false - openstacksdk-functional-devstack: irrelevant-files: *tempest-irrelevant-files voting: false @@ -743,8 +667,6 @@ - swift-tox-func-encryption-py38 - swift-tox-func-ec-py38 - swift-func-cors - - swift-probetests-centos-7: - irrelevant-files: *probetest-irrelevant-files - swift-probetests-centos-8-stream: irrelevant-files: *probetest-irrelevant-files - swift-dsvm-functional: @@ -759,25 +681,15 @@ irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: irrelevant-files: *tempest-irrelevant-files - - grenade: - irrelevant-files: *tempest-irrelevant-files - openstacksdk-functional-devstack: irrelevant-files: *tempest-irrelevant-files voting: false experimental: jobs: - - 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-func-py36-centos-8-stream - swift-tox-func-encryption-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-wallaby - swift-multinode-rolling-upgrade-master: diff --git a/tools/playbooks/cors/run.yaml b/tools/playbooks/cors/run.yaml index cd8d73d092..a90fc86b05 100644 --- a/tools/playbooks/cors/run.yaml +++ b/tools/playbooks/cors/run.yaml @@ -9,7 +9,7 @@ - name: Run CORS tests shell: > - python + python3 {{ ansible_env.HOME }}/{{ zuul.project.src_dir }}/test/cors/main.py --output {{ ansible_env.HOME }}/cors-test-results.txt all