[release-2.2] [E2E] Fix aws provider version

kubernetes-sigs · Oct 11, 2023 · fbacb32 · fbacb32
1 parent b0a62c8
commit fbacb32
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -38,7 +38,7 @@ 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.

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

diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml
@@ -123,7 +123,7 @@ providers:
         files:
           - sourcePath: "./shared/v1beta1_provider/metadata.yaml"
           - sourcePath: "./infrastructure-aws/capi-upgrades/v1beta1/cluster-template.yaml"
-      - name: v2.0.99
+      - name: v2.2.99
         # Use manifest from source files
         value: ../../../config/default
         # Do not add contract field for v1beta1 --> v1beta2 clusterctl upgrades test to work.