Skip to content

Commit

Permalink
FIXUP: scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
rjeffman committed Jun 30, 2024
1 parent 1912f8d commit 5931b4a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions utils/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion utils/shansible
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5931b4a

Please sign in to comment.