Ensure that python and pip is installed for e2e and conformance tests

Signed-off-by: Tobias Giese <[email protected]>

Author: tobiasgiese

scripts/ci-conformance.sh

@@ -45,13 +45,13 @@ cleanup() {
 }
 trap cleanup EXIT
 
-# Set correct pip3.7 location for python3.
-if ! test -f /usr/bin/pip3.7 && test -f /usr/local/bin/pip3.7; then
-  ln -s /usr/local/bin/pip3.7 /usr/bin/pip3.7
-fi
+# Ensure that python3-pip is installed.
+apt update
+apt install -y python3-pip
+rm -rf /var/lib/apt/lists/*
 
-# Install requests module explicitly for HTTP calls.
-python3 -m pip install requests
+# Install/upgrade pip and requests module explicitly for HTTP calls.
+python3 -m pip install --upgrade pip requests
 
 # If BOSKOS_HOST is set then acquire a resource of type ${RESOURCE_TYPE} from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then

scripts/ci-e2e.sh

@@ -46,13 +46,13 @@ cleanup() {
 }
 trap cleanup EXIT
 
-# Set correct pip3.7 location for python3.
-if ! test -f /usr/bin/pip3.7 && test -f /usr/local/bin/pip3.7; then
-  ln -s /usr/local/bin/pip3.7 /usr/bin/pip3.7
-fi
+# Ensure that python3-pip is installed.
+apt update
+apt install -y python3-pip
+rm -rf /var/lib/apt/lists/*
 
-# Install requests module explicitly for HTTP calls.
-python3 -m pip install requests
+# Install/upgrade pip and requests module explicitly for HTTP calls.
+python3 -m pip install --upgrade pip requests
 
 # If BOSKOS_HOST is set then acquire a resource of type ${RESOURCE_TYPE} from Boskos.
 if [ -n "${BOSKOS_HOST:-}" ]; then