openstack
/
swift
Code Issues Proposed changes

Merge "CI: Move probe tests to centos 9 stream"

This commit is contained in:
Zuul 2024-03-21 01:46:32 +00:00 committed by Gerrit Code Review
parent fd3997f027 1c03d58643
commit d3938c3547
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.zuul.yaml
View File

@ -348,16 +348,16 @@
- 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:
s3_acl: no s3_acl: no
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
@ -367,12 +367,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.
@ -380,7 +380,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
@ -713,7 +713,7 @@
- ^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-8-stream: - swift-probetests-centos-9-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
@ -769,7 +769,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

4
tools/playbooks/common/install_dependencies.yaml
View File

@ -22,13 +22,13 @@
name: pip name: pip
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'

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

@ -7,7 +7,7 @@
state: present 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: