Skip to content

Commit

Permalink
Don't force python interpreter on ubuntu (kubernetes-sigs#11183)
Browse files Browse the repository at this point in the history
This allows local override in tasks for using virtualenvs.
  • Loading branch information
VannTen authored and davidumea committed Oct 25, 2024
1 parent 0e94f48 commit 533878d
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions tests/scripts/testcases_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -euxo pipefail

echo "CI_JOB_NAME is $CI_JOB_NAME"
CI_TEST_ADDITIONAL_VARS=""

if [[ "$CI_JOB_NAME" =~ "upgrade" ]]; then
if [ "${UPGRADE_TEST}" == "false" ]; then
Expand Down Expand Up @@ -42,11 +41,6 @@ if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then
ansible all -m raw -a 'zypper --gpg-auto-import-keys refresh'
fi

if [[ "$CI_JOB_NAME" =~ "ubuntu" ]]; then
# We need to tell ansible that ubuntu hosts are python3 only
CI_TEST_ADDITIONAL_VARS="-e ansible_python_interpreter=/usr/bin/python3"
fi

# Check out latest tag if testing upgrade
test "${UPGRADE_TEST}" != "false" && git fetch --all && git checkout "$KUBESPRAY_VERSION"
# Checkout the CI vars file so it is available
Expand All @@ -63,7 +57,7 @@ ansible-playbook --limit "all:!fake_hosts" \
$ANSIBLE_LOG_LEVEL \
-e @${CI_TEST_SETTING} \
-e @${CI_TEST_REGISTRY_MIRROR} \
-e @${CI_TEST_VARS} ${CI_TEST_ADDITIONAL_VARS} \
-e @${CI_TEST_VARS} \
-e local_release_dir=${PWD}/downloads \
"$@" \
${playbook}
Expand Down

0 comments on commit 533878d

Please sign in to comment.