Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
0b253314
Unverified
Commit
0b253314
authored
11 months ago
by
Max Gautier
Committed by
GitHub
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't force python interpreter on ubuntu (#11183)
This allows local override in tasks for using virtualenvs.
parent
3e4ea106
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/scripts/testcases_run.sh
+1
-7
1 addition, 7 deletions
tests/scripts/testcases_run.sh
with
1 addition
and
7 deletions
tests/scripts/testcases_run.sh
+
1
−
7
View file @
0b253314
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
set
-euxo
pipefail
set
-euxo
pipefail
echo
"CI_JOB_NAME is
$CI_JOB_NAME
"
echo
"CI_JOB_NAME is
$CI_JOB_NAME
"
CI_TEST_ADDITIONAL_VARS
=
""
if
[[
"
$CI_JOB_NAME
"
=
~
"upgrade"
]]
;
then
if
[[
"
$CI_JOB_NAME
"
=
~
"upgrade"
]]
;
then
if
[
"
${
UPGRADE_TEST
}
"
==
"false"
]
;
then
if
[
"
${
UPGRADE_TEST
}
"
==
"false"
]
;
then
...
@@ -42,11 +41,6 @@ if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then
...
@@ -42,11 +41,6 @@ if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then
ansible all
-m
raw
-a
'zypper --gpg-auto-import-keys refresh'
ansible all
-m
raw
-a
'zypper --gpg-auto-import-keys refresh'
fi
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
# Check out latest tag if testing upgrade
test
"
${
UPGRADE_TEST
}
"
!=
"false"
&&
git fetch
--all
&&
git checkout
"
$KUBESPRAY_VERSION
"
test
"
${
UPGRADE_TEST
}
"
!=
"false"
&&
git fetch
--all
&&
git checkout
"
$KUBESPRAY_VERSION
"
# Checkout the CI vars file so it is available
# Checkout the CI vars file so it is available
...
@@ -63,7 +57,7 @@ ansible-playbook --limit "all:!fake_hosts" \
...
@@ -63,7 +57,7 @@ ansible-playbook --limit "all:!fake_hosts" \
$ANSIBLE_LOG_LEVEL
\
$ANSIBLE_LOG_LEVEL
\
-e
@
${
CI_TEST_SETTING
}
\
-e
@
${
CI_TEST_SETTING
}
\
-e
@
${
CI_TEST_REGISTRY_MIRROR
}
\
-e
@
${
CI_TEST_REGISTRY_MIRROR
}
\
-e
@
${
CI_TEST_VARS
}
${
CI_TEST_ADDITIONAL_VARS
}
\
-e
@
${
CI_TEST_VARS
}
\
-e
local_release_dir
=
${
PWD
}
/downloads
\
-e
local_release_dir
=
${
PWD
}
/downloads
\
"
$@
"
\
"
$@
"
\
${
playbook
}
${
playbook
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment