diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-14 13:26:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-14 13:26:08 +0000 |
| commit | 72f7e89db1810446def52086e9306e6d7f8d5ae4 (patch) | |
| tree | 07ce17a559ab8ff48501b5afb2eff93ec79daaae | |
| parent | 11cb31258fa5b429ea9881c92b2d745fd127cdaf (diff) | |
| parent | 9a7028f02cbdfe034b98f524c1bc8c497f14e423 (diff) | |
| download | nova-72f7e89db1810446def52086e9306e6d7f8d5ae4.tar.gz | |
Merge "Test setting the nova job to centos-9-stream"
| -rw-r--r-- | .zuul.yaml | 5 | ||||
| -rwxr-xr-x | tools/test-setup.sh | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 8fdee8cd5a..0d489a5a82 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -746,8 +746,7 @@ # Runs emulation feature functionality test less frequently due # to being the initial release and experimental in nature. - nova-emulation - - tempest-integrated-compute-centos-9-stream: - irrelevant-files: *nova-base-irrelevant-files + - tempest-centos9-stream-fips experimental: jobs: - ironic-tempest-bfv: @@ -777,7 +776,7 @@ irrelevant-files: *nova-base-irrelevant-files - devstack-tobiko-nova: irrelevant-files: *nova-base-irrelevant-files - - tempest-centos8-stream-fips: + - tempest-centos9-stream-fips: irrelevant-files: *nova-base-irrelevant-files - nova-emulation - tempest-integrated-compute-centos-9-stream: diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 96a08c4a98..fced9be5e0 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -27,13 +27,19 @@ function is_rhel8 { 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' +} + function set_conf_line { # file regex value sudo sh -c "grep -q -e '$2' $1 && \ sed -i 's|$2|$3|g' $1 || \ echo '$3' >> $1" } -if is_rhel7 || is_rhel8; then +if is_rhel7 || is_rhel8 || is_rhel9; then # mysql needs to be started on centos/rhel sudo systemctl restart mariadb.service |