Skip to content

Commit 8adb83a

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix rockylinux and make it voting"
2 parents 45ef574 + fcc525f commit 8adb83a

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

‎.zuul.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,6 @@
726726
description: Rocky Linux 9 Blue Onyx platform test
727727
nodeset: devstack-single-node-rockylinux-9
728728
timeout: 9000
729-
voting: false
730729
vars:
731730
configure_swap_size: 4096
732731

‎stack.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,13 @@ elif [[ $DISTRO == "rhel9" ]]; then
394394
sudo dnf config-manager --set-enabled crb
395395
# rabbitmq and other packages are provided by RDO repositories.
396396
_install_rdo
397+
398+
# Some distributions (Rocky Linux 9) provide curl-minimal instead of curl,
399+
# it triggers a conflict when devstack wants to install "curl".
400+
# Swap curl-minimal with curl.
401+
if is_package_installed curl-minimal; then
402+
sudo dnf swap -y curl-minimal curl
403+
fi
397404
elif [[ $DISTRO == "openEuler-22.03" ]]; then
398405
# There are some problem in openEuler. We should fix it first. Some required
399406
# package/action runs before fixup script. So we can't fix there.

0 commit comments

Comments
 (0)