diff --git a/utils/run-tests.sh b/utils/run-tests.sh index 042a47bc29..89fd69f6fb 100755 --- a/utils/run-tests.sh +++ b/utils/run-tests.sh @@ -125,7 +125,7 @@ export STOP_CONTAINER FORCE_ENV STOP_VIRTUALENV [ ${SPLITS} -eq 0 ] && [ ${#ENABLED_MODULES[@]} -eq 0 ] && [ ${#ENABLED_TESTS[@]} -eq 0 ] && die -u "No test defined." # Ensure $python is set. -[ -z "${python}" ] && python="python3" +[ -z "${python}" ] && python="/usr/bin/python3" log info "Controller python executable: ${python}" ${python} --version @@ -136,7 +136,7 @@ log info "Installing dependencies from 'requirements-tests.txt'" pip install --upgrade -r "${TOPDIR}/requirements-tests.txt" # shellcheck disable=SC2119 -[ -z "SKIP_ANSIBLE" ] || install_ansible +[ -z "SKIP_ANSIBLE" ] && install_ansible # Ansible configuration export ANSIBLE_ROLES_PATH="${TOPDIR}/roles" diff --git a/utils/shansible b/utils/shansible index 59bd620a2b..a6c365e57b 100644 --- a/utils/shansible +++ b/utils/shansible @@ -43,7 +43,7 @@ make_inventory() { log info "Inventory file: ${inventory}" cat << EOF > "${inventory}" [ipaserver] -${scenario} ansible_connection=${pod_engine} ansible_python_interpreter=/usr/bin/python3 +${scenario} ansible_connection=${pod_engine} ansible_python_interpreter=${python:-"/usr/bin/python3"} [ipaserver:vars] ipaserver_domain = test.local ipaserver_realm = TEST.LOCAL