Skip to content

Commit 29babe4

Browse files
fix test
1 parent f9de0e4 commit 29babe4

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

src/common-utils/main.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ install_redhat_packages() {
153153
lsof \
154154
net-tools \
155155
psmisc \
156-
curl \
157156
wget \
158157
ca-certificates \
159158
rsync \
@@ -174,6 +173,12 @@ install_redhat_packages() {
174173
man-db \
175174
strace"
176175

176+
# rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
177+
# Install 'curl' for every OS except this rockylinux:9
178+
if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
179+
package_list="${package_list} curl"
180+
fi
181+
177182
# Install OpenSSL 1.0 compat if needed
178183
if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
179184
package_list="${package_list} compat-openssl10"

test/common-utils/rocky-8.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
99
. /etc/os-release
1010
check "non-root user" test "$(whoami)" = "devcontainer"
1111
check "distro" test "${PLATFORM_ID}" = "platform:el8"
12+
check "curl" curl --version
1213

1314
# Report result
1415
reportResults

test/common-utils/rocky-9.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
99
. /etc/os-release
1010
check "non-root user" test "$(whoami)" = "devcontainer"
1111
check "distro" test "${PLATFORM_ID}" = "platform:el9"
12+
check "curl" curl --version
1213

1314
# Report result
1415
reportResults

0 commit comments

Comments
 (0)