Merge pull request #1307 from mercedes-benz/tobiasgiese/test-update-calico-v125

🐛 Update calico manifest for e2e testing

Author: k8s-ci-robot

scripts/ci-conformance.sh

@@ -45,7 +45,12 @@ cleanup() {
 }
 trap cleanup EXIT
 
-#Install requests module explicitly for HTTP calls
+# 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
+
+# Install requests module explicitly for HTTP calls.
 python3 -m pip install requests
 
 # If BOSKOS_HOST is set then acquire a resource of type ${RESOURCE_TYPE} from Boskos.

scripts/ci-e2e.sh

@@ -46,7 +46,12 @@ cleanup() {
 }
 trap cleanup EXIT
 
-#Install requests module explicitly for HTTP calls
+# 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
+
+# Install requests module explicitly for HTTP calls.
 python3 -m pip install requests
 
 # If BOSKOS_HOST is set then acquire a resource of type ${RESOURCE_TYPE} from Boskos.