Commit 29babe42 authored by Samruddhi Khandale's avatar Samruddhi Khandale

fix test

parent f9de0e43
...@@ -153,7 +153,6 @@ install_redhat_packages() { ...@@ -153,7 +153,6 @@ install_redhat_packages() {
lsof \ lsof \
net-tools \ net-tools \
psmisc \ psmisc \
curl \
wget \ wget \
ca-certificates \ ca-certificates \
rsync \ rsync \
...@@ -174,6 +173,12 @@ install_redhat_packages() { ...@@ -174,6 +173,12 @@ install_redhat_packages() {
man-db \ man-db \
strace" strace"
# rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
# Install 'curl' for every OS except this rockylinux:9
if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
package_list="${package_list} curl"
fi
# Install OpenSSL 1.0 compat if needed # Install OpenSSL 1.0 compat if needed
if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
package_list="${package_list} compat-openssl10" package_list="${package_list} compat-openssl10"
......
...@@ -9,6 +9,7 @@ source dev-container-features-test-lib ...@@ -9,6 +9,7 @@ source dev-container-features-test-lib
. /etc/os-release . /etc/os-release
check "non-root user" test "$(whoami)" = "devcontainer" check "non-root user" test "$(whoami)" = "devcontainer"
check "distro" test "${PLATFORM_ID}" = "platform:el8" check "distro" test "${PLATFORM_ID}" = "platform:el8"
check "curl" curl --version
# Report result # Report result
reportResults reportResults
\ No newline at end of file
...@@ -9,6 +9,7 @@ source dev-container-features-test-lib ...@@ -9,6 +9,7 @@ source dev-container-features-test-lib
. /etc/os-release . /etc/os-release
check "non-root user" test "$(whoami)" = "devcontainer" check "non-root user" test "$(whoami)" = "devcontainer"
check "distro" test "${PLATFORM_ID}" = "platform:el9" check "distro" test "${PLATFORM_ID}" = "platform:el9"
check "curl" curl --version
# Report result # Report result
reportResults reportResults
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment