CI: Move off CentOS 8

This is a combination of 2 commits.

========================================

CI: Move probe tests to centos 9 stream

Pin selenium to 3.x for now, until we can run down the issues with 4.x

========================================

CI: Move off CentOS 8

Remove swift-tox-py36-centos-8-stream job entirely.

Move the following jobs to CentOS 9:

  - swift-tox-func-s3api-ceph-s3tests-tempauth
  - swift-tox-func-s3api-tests-tempauth
  - swift-multinode-rolling-upgrade, as well as the other rolling
    upgrade jobs

Remove the swift-multinode-rolling-upgrade-victoria job, as py39
support (required for CentOS 9) was not added until wallaby.

========================================

Conflicts:
  .zuul.yaml

NOTE(elod.illes): this patch is backported to unmaintained/zed as
CentOS Stream 8 is EOL and centos-8-stream nodeset was removed from
Zuul and it gives a config error: 'The nodeset "centos-8-stream" was
not found.' Besides, official Zed runtimes [1] contains CentOS Stream 9
and python 3.9.

[1] https://governance.openstack.org/tc/reference/runtimes/zed.html

Related-Change: I596415d17f77f48a6e8a63a61b734a8ca0865847
Change-Id: I4f6b9c07af7bc768654f1a5d0c66b048e0f2c9c1
(cherry picked from commit 2032fb214e)
This commit is contained in:
Tim Burke
2024-06-04 08:58:19 -07:00
committed by Elod Illes
parent 4905519997
commit 9fa1b7edec
3 changed files with 30 additions and 37 deletions

View File

@@ -45,11 +45,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-py36-centos-8-stream
parent: swift-tox-py36
nodeset: centos-8-stream
- job: - job:
name: swift-tox-py37 name: swift-tox-py37
parent: swift-tox-base parent: swift-tox-base
@@ -285,13 +280,13 @@
name: swift-tox-func-s3api-ceph-s3tests-tempauth name: swift-tox-func-s3api-ceph-s3tests-tempauth
parent: unittests parent: unittests
voting: false voting: false
nodeset: centos-8-stream nodeset: centos-9-stream
description: | description: |
Setup a SAIO dev environment and run ceph-s3tests Setup a SAIO dev environment and run ceph-s3tests
timeout: 5400 timeout: 5400
vars: vars:
s3_acl: yes s3_acl: yes
bindep_profile: test py36 bindep_profile: test py39
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
@@ -306,13 +301,13 @@
- job: - job:
name: swift-tox-func-s3api-tests-tempauth name: swift-tox-func-s3api-tests-tempauth
parent: unittests parent: unittests
nodeset: centos-8-stream nodeset: centos-9-stream
description: | description: |
Setup a SAIO dev environment and run our s3api test suite Setup a SAIO dev environment and run our s3api test suite
timeout: 1800 timeout: 1800
vars: vars:
s3_acl: yes s3_acl: yes
bindep_profile: test py36 bindep_profile: test py39
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
@@ -324,15 +319,15 @@
- tools/playbooks/probetests/post.yaml - tools/playbooks/probetests/post.yaml
- job: - job:
name: swift-probetests-centos-8-stream name: swift-probetests-centos-9-stream
parent: unittests parent: unittests
nodeset: centos-8-stream nodeset: centos-9-stream
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 3. under Python 3.
timeout: 7200 timeout: 7200
vars: vars:
bindep_profile: test py36 bindep_profile: test py39
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
@@ -341,12 +336,12 @@
post-run: tools/playbooks/probetests/post.yaml post-run: tools/playbooks/probetests/post.yaml
- job: - job:
name: swift-probetests-centos-8-stream-arm64 name: swift-probetests-centos-9-stream-arm64
parent: swift-probetests-centos-8-stream parent: swift-probetests-centos-9-stream
nodeset: nodeset:
nodes: nodes:
- name: swift-centos-8-stream-arm64 - name: swift-centos-9-stream-arm64
label: centos-8-stream-arm64 label: centos-9-stream-arm64
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 3 on top of arm64 architecture. under Python 3 on top of arm64 architecture.
@@ -354,7 +349,7 @@
- job: - job:
name: swift-func-cors name: swift-func-cors
parent: swift-probetests-centos-8-stream parent: swift-probetests-centos-9-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
@@ -367,18 +362,18 @@
post-run: tools/playbooks/cors/post.yaml post-run: tools/playbooks/cors/post.yaml
- nodeset: - nodeset:
name: swift-five-nodes-py3 name: swift-five-nodes-centos-9
nodes: nodes:
- name: test-runner1 - name: test-runner1
label: centos-8-stream label: centos-9-stream
- name: proxy1 - name: proxy1
label: centos-8-stream label: centos-9-stream
- name: account1 - name: account1
label: centos-8-stream label: centos-9-stream
- name: container1 - name: container1
label: centos-8-stream label: centos-9-stream
- name: object1 - name: object1
label: centos-8-stream label: centos-9-stream
groups: groups:
- name: test-runner - name: test-runner
nodes: nodes:
@@ -410,12 +405,12 @@
- job: - job:
name: swift-multinode-rolling-upgrade name: swift-multinode-rolling-upgrade
parent: multinode parent: multinode
nodeset: swift-five-nodes-py3 nodeset: swift-five-nodes-centos-9
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
vars: vars:
bindep_profile: test py36 bindep_profile: test py39
pre-run: pre-run:
- tools/playbooks/multinode_setup/pre.yaml - tools/playbooks/multinode_setup/pre.yaml
- tools/playbooks/common/install_dependencies.yaml - tools/playbooks/common/install_dependencies.yaml
@@ -425,12 +420,6 @@
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-victoria
parent: swift-multinode-rolling-upgrade
vars:
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
@@ -716,7 +705,7 @@
- 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-8-stream: - swift-probetests-centos-9-stream:
irrelevant-files: *probetest-irrelevant-files irrelevant-files: *probetest-irrelevant-files
- swift-dsvm-functional: - swift-dsvm-functional:
irrelevant-files: *functest-irrelevant-files irrelevant-files: *functest-irrelevant-files
@@ -735,11 +724,9 @@
jobs: jobs:
- swift-tox-py37 - swift-tox-py37
- swift-tox-py38 - swift-tox-py38
- 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-victoria
- swift-multinode-rolling-upgrade-wallaby - swift-multinode-rolling-upgrade-wallaby
- swift-multinode-rolling-upgrade-xena - swift-multinode-rolling-upgrade-xena
- swift-multinode-rolling-upgrade-master: - swift-multinode-rolling-upgrade-master:

View File

@@ -24,13 +24,13 @@
name: pip<21 name: pip<21
extra_args: --upgrade extra_args: --upgrade
- name: install rsync-daemon - CentOS 8 - name: install rsync-daemon - CentOS 8, 9
package: package:
name: rsync-daemon name: rsync-daemon
state: present state: present
when: when:
- ansible_facts['distribution'] == "CentOS" - ansible_facts['distribution'] == "CentOS"
- ansible_facts['distribution_major_version'] == "8" - ansible_facts['distribution_major_version'] != "7"
- name: install python modules with pip - name: install python modules with pip
pip: name={{ item }} state=present extra_args='--upgrade' pip: name={{ item }} state=present extra_args='--upgrade'

View File

@@ -5,9 +5,15 @@
yum: yum:
name: xorg-x11-server-Xvfb name: xorg-x11-server-Xvfb
state: present state: present
# Note that more recent branches would require boto3, which would
# (eventually) enforce a similar version cap on urllib3
- name: cap urllib3
pip:
name: 'urllib3<2'
state: present
- name: install selenium - name: install selenium
pip: pip:
name: selenium name: 'selenium<4'
state: present state: present
- name: install firefox - name: install firefox
yum: yum: