Merge "Fix rockylinux and make it voting"

This commit is contained in:
Zuul
2023-02-20 17:16:42 +00:00
committed by Gerrit Code Review
2 changed files with 7 additions and 1 deletions

View File

@@ -726,7 +726,6 @@
description: Rocky Linux 9 Blue Onyx platform test
nodeset: devstack-single-node-rockylinux-9
timeout: 9000
voting: false
vars:
configure_swap_size: 4096

View File

@@ -394,6 +394,13 @@ elif [[ $DISTRO == "rhel9" ]]; then
sudo dnf config-manager --set-enabled crb
# rabbitmq and other packages are provided by RDO repositories.
_install_rdo
# Some distributions (Rocky Linux 9) provide curl-minimal instead of curl,
# it triggers a conflict when devstack wants to install "curl".
# Swap curl-minimal with curl.
if is_package_installed curl-minimal; then
sudo dnf swap -y curl-minimal curl
fi
elif [[ $DISTRO == "openEuler-22.03" ]]; then
# There are some problem in openEuler. We should fix it first. Some required
# package/action runs before fixup script. So we can't fix there.