openstack/swift
Code Issues Proposed changes

Migrate CentOS Stream 8 FIPS job to CentOS Stream 9

Browse Source 
Change-Id: I8b0bd7ee1c649294ac3795cba801c9e07bc3d51b
This commit is contained in:
afariasa 2022-08-16 12:42:46 +00:00 committed by Tim Burke
parent d8af3d7a0d
commit da52e56751
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.zuul.yaml
View File

@ -156,22 +156,22 @@
python_version: 3.8 python_version: 3.8
- job: - job:
name: swift-tox-func-py36-centos-8-stream name: swift-tox-func-py39-centos-9-stream
parent: swift-tox-func-py38 parent: swift-tox-func-py38
nodeset: centos-8-stream nodeset: centos-9-stream
vars: vars:
bindep_profile: test py36 bindep_profile: test py39
python_version: 3.6 python_version: 3.9
- job: - job:
name: swift-tox-func-encryption-py36-centos-8-stream name: swift-tox-func-encryption-py39-centos-9-stream
parent: swift-tox-func-py36-centos-8-stream parent: swift-tox-func-py39-centos-9-stream
vars: vars:
tox_envlist: func-encryption-py3 tox_envlist: func-encryption-py3
- job: - job:
name: swift-tox-func-ec-py36-centos-8-stream name: swift-tox-func-ec-py39-centos-9-stream
parent: swift-tox-func-py36-centos-8-stream parent: swift-tox-func-py39-centos-9-stream
vars: vars:
tox_envlist: func-ec-py3 tox_envlist: func-ec-py3
@ -585,32 +585,32 @@
vars: *swift_image_vars_py3 vars: *swift_image_vars_py3
- job: - job:
name: swift-tox-func-py36-centos-8-stream-fips name: swift-tox-func-py39-centos-9-stream-fips
parent: swift-tox-func-py36-centos-8-stream parent: swift-tox-func-py39-centos-9-stream
voting: false voting: false
description: | description: |
Functional testing on a FIPS enabled Centos 8 system Functional testing on a FIPS enabled Centos 9 system
vars: vars:
nslookup_target: 'opendev.org' nslookup_target: 'opendev.org'
enable_fips: true enable_fips: true
- job: - job:
name: swift-tox-func-encryption-py36-centos-8-stream-fips name: swift-tox-func-encryption-py39-centos-9-stream-fips
parent: swift-tox-func-encryption-py36-centos-8-stream parent: swift-tox-func-encryption-py39-centos-9-stream
voting: false voting: false
description: | description: |
Functional encryption testing on a FIPS enabled Functional encryption testing on a FIPS enabled
Centos 8 system Centos 9 system
vars: vars:
nslookup_target: 'opendev.org' nslookup_target: 'opendev.org'
enable_fips: true enable_fips: true
- job: - job:
name: swift-tox-func-ec-py36-centos-8-stream-fips name: swift-tox-func-ec-py39-centos-9-stream-fips
parent: swift-tox-func-ec-py36-centos-8-stream parent: swift-tox-func-ec-py39-centos-9-stream
voting: false voting: false
description: | description: |
Functional EC testing on a FIPS enabled Centos 8 system Functional EC testing on a FIPS enabled Centos 9 system
vars: vars:
nslookup_target: 'opendev.org' nslookup_target: 'opendev.org'
enable_fips: true enable_fips: true
@ -637,14 +637,14 @@
- swift-jobs-arm64 - swift-jobs-arm64
check: check:
jobs: jobs:
- swift-tox-func-py36-centos-8-stream-fips: - swift-tox-func-py39-centos-9-stream-fips:
irrelevant-files: &functest-irrelevant-files irrelevant-files: &functest-irrelevant-files
- ^(api-ref|doc|releasenotes)/.*$ - ^(api-ref|doc|releasenotes)/.*$
- ^test/(cors|probe|s3api)/.*$ - ^test/(cors|probe|s3api)/.*$
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$ - ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
- swift-tox-func-encryption-py36-centos-8-stream-fips: - swift-tox-func-encryption-py39-centos-9-stream-fips:
irrelevant-files: *functest-irrelevant-files irrelevant-files: *functest-irrelevant-files
- swift-tox-func-ec-py36-centos-8-stream-fips: - swift-tox-func-ec-py39-centos-9-stream-fips:
irrelevant-files: *functest-irrelevant-files irrelevant-files: *functest-irrelevant-files
- swift-build-image: - swift-build-image:
irrelevant-files: &docker-irrelevant-files irrelevant-files: &docker-irrelevant-files
@ -783,9 +783,9 @@
- swift-tox-func-encryption-py27-centos-7 - swift-tox-func-encryption-py27-centos-7
- swift-tox-func-ec-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-py39-centos-9-stream
- swift-tox-func-encryption-py36-centos-8-stream - swift-tox-func-encryption-py39-centos-9-stream
- swift-tox-func-ec-py36-centos-8-stream - swift-tox-func-ec-py39-centos-9-stream
- swift-multinode-rolling-upgrade-rocky - swift-multinode-rolling-upgrade-rocky
- swift-multinode-rolling-upgrade-stein - swift-multinode-rolling-upgrade-stein
- swift-multinode-rolling-upgrade-train - swift-multinode-rolling-upgrade-train

12
tools/test-setup.sh
View File

@ -25,6 +25,11 @@ function is_rhel8 {
cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \ cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
cat /etc/*release | grep -q 'release 8' cat /etc/*release | grep -q 'release 8'
} }
function is_rhel9 {
[ -f /usr/bin/dnf ] && \
cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
cat /etc/*release | grep -q 'release 9'
}
if is_rhel7; then if is_rhel7; then
@ -40,3 +45,10 @@ if is_rhel8; then
sudo dnf install -y centos-release-openstack-xena sudo dnf install -y centos-release-openstack-xena
sudo dnf install -y liberasurecode-devel sudo dnf install -y liberasurecode-devel
fi fi
if is_rhel9; then
# Install CentOS OpenStack repos so that we have access to some extra
# packages.
sudo dnf install -y centos-release-openstack-yoga
sudo dnf install -y liberasurecode-devel
fi