From 546f27f461edb6d6fbea80a59597c6d3ccf6ee01 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Sun, 30 Jun 2024 13:34:40 +0000 Subject: [PATCH] FIXUP: scripts --- utils/run-tests.sh | 4 ++-- utils/shcontainer | 2 +- utils/shfun | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/run-tests.sh b/utils/run-tests.sh index d2892def4e..54a51f723b 100755 --- a/utils/run-tests.sh +++ b/utils/run-tests.sh @@ -54,8 +54,8 @@ STOP_CONTAINER="Y" STOP_VIRTUALENV="N" declare -a ENABLED_MODULES declare -a ENABLED_TESTS -read -a ENABLED_MODULES <<< "${IPA_ENABLED_MODULES:-""}" -read -a ENABLED_TESTS <<< "${IPA_ENABLED_MODULES:-""}" +read -r -a ENABLED_MODULES <<< "${IPA_ENABLED_MODULES:-""}" +read -r -a ENABLED_TESTS <<< "${IPA_ENABLED_MODULES:-""}" IMAGE_TAG="fedora-latest" scenario="freeipa-tests" MEMORY=3 diff --git a/utils/shcontainer b/utils/shcontainer index ff774243da..1ed23c797b 100644 --- a/utils/shcontainer +++ b/utils/shcontainer @@ -49,7 +49,7 @@ start_container() { # With docker on Ubuntu, it might take a couple of seconds # for the container to be available. sleep 3 - # run_if_exists ansible_ping "${inventory}" + run_if_exists ansible_ping "${inventory}" run_if_exists query_container_installed_software } diff --git a/utils/shfun b/utils/shfun index 1e2b4ec891..1fdd01f819 100644 --- a/utils/shfun +++ b/utils/shfun @@ -114,7 +114,7 @@ start_python_virtual_environment() { export STOP_VIRTUALENV="Y" log info "Installing required tools." log none "Upgrading: pip setuptools wheel" - pip install --quiet --upgrade pip setuptools wheel + pip install --quiet --upgrade pip setuptools 'wheel<0.38.0' else log info "Using current virtual environment." fi