Merge pull request #4564 from vincepri/fixup-python-ci

🐛 Fix "error: externally-managed-environment" CI
kubernetes-sigs · Oct 10, 2023 · 24f82c0 · 24f82c0
2 parents d0c8e32 + a5080ee
commit 24f82c0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -38,12 +38,9 @@ trap cleanup EXIT
 
 # Ensure that python3-pip is installed.
 apt update
-apt install -y python3-pip
+apt install -y python3-pip python3-requests
 rm -rf /var/lib/apt/lists/*
 
-# Install/upgrade pip and requests module explicitly for HTTP calls.
-python3 -m pip install --upgrade pip requests
-
 # If BOSKOS_HOST is set then acquire an AWS account from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then
   # Check out the account from Boskos and store the produced environment

diff --git a/scripts/ci-e2e-eks-gc.sh b/scripts/ci-e2e-eks-gc.sh
@@ -47,7 +47,8 @@ cleanup() {
 trap cleanup EXIT
 
 #Install requests module explicitly for HTTP calls
-python3 -m pip install requests
+apt update
+apt install -y python3-pip python3-requests
 
 # If BOSKOS_HOST is set then acquire an AWS account from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then

diff --git a/scripts/ci-e2e-eks.sh b/scripts/ci-e2e-eks.sh
@@ -47,7 +47,8 @@ cleanup() {
 trap cleanup EXIT
 
 #Install requests module explicitly for HTTP calls
-python3 -m pip install requests
+apt update
+apt install -y python3-pip python3-requests
 
 # If BOSKOS_HOST is set then acquire an AWS account from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then

diff --git a/scripts/ci-e2e-gc.sh b/scripts/ci-e2e-gc.sh
@@ -47,7 +47,8 @@ cleanup() {
 trap cleanup EXIT
 
 #Install requests module explicitly for HTTP calls
-python3 -m pip install requests
+apt update
+apt install -y python3-pip python3-requests
 
 # If BOSKOS_HOST is set then acquire an AWS account from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -53,7 +53,8 @@ apt install -y python3-pip
 rm -rf /var/lib/apt/lists/*
 
 # Install/upgrade pip and requests module explicitly for HTTP calls.
-python3 -m pip install --upgrade pip requests
+apt update
+apt install -y python3-pip python3-requests
 
 # If BOSKOS_HOST is set then acquire an AWS account from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then