Improve hotfix test (#2224)

* Change cache action to save operator binaries * Change starting MinIO version to `RELEASE.2024-01-31T20-20-33Z`' * Timeout hotfix test in 1 min Signed-off-by: pjuarezd <[email protected]>
minio · Jul 18, 2024 · b05e586 · b05e586
1 parent 82484b0
commit b05e586
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 221 deletions.
diff --git a/.github/workflows/kubernetes-tests.yml b/.github/workflows/kubernetes-tests.yml
@@ -192,15 +192,15 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
-      - uses: actions/cache@v3
-        name: Operator Binary Cache
+      - name: Operator Binary
+        run: |
+          make operator
+      - uses: actions/cache/save@v3
+        name: Save Operator Binary
         with:
           path: |
             ./minio-operator
           key: ${{ runner.os }}-binary-${{ github.run_id }}
-      - name: Operator Binary
-        run: |
-          make operator
   sidecar:
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
@@ -217,16 +217,16 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
-      - uses: actions/cache@v3
-        name: Operator Sidecar Binary Cache
-        with:
-          path: |
-            ./sidecar/minio-operator-sidecar
-          key: ${{ runner.os }}-sidecar-binary-${{ github.run_id }}
       - name: Operator Sidecar Binary
         working-directory: ./sidecar
         run: |
           make sidecar
+      - uses: actions/cache/save@v3
+        name: Save Operator Sidecar Binary
+        with:
+          path: |
+            ./sidecar/minio-operator-sidecar
+          key: ${{ runner.os }}-sidecar-binary-${{ github.run_id }}
   test-tenant:
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
@@ -319,7 +319,7 @@ jobs:
   #        run: |
   #          "${GITHUB_WORKSPACE}/testing/console-tenant+kes.sh"
   test-tenant-hotfix-update:
-    timeout-minutes: 30
+    timeout-minutes: 10
     runs-on: ${{ matrix.os }}
     needs:
       - operator
@@ -347,7 +347,7 @@ jobs:
           key: ${{ runner.os }}-sidecar-binary-${{ github.run_id }}
       - name: Tenant upgrade to hotfix version
         run: |
-          "${GITHUB_WORKSPACE}/testing/tenant-hotfix-update.sh" "quay.io/minio/minio:RELEASE.2024-02-04T22-36-13Z" "quay.io/minio/minio:RELEASE.2024-02-04T22-36-13Z.hotfix.c40028f8f"
+          "${GITHUB_WORKSPACE}/testing/tenant-hotfix-update.sh" "quay.io/minio/minio:RELEASE.2024-01-31T20-20-33Z" "quay.io/minio/minio:RELEASE.2024-02-04T22-36-13Z.hotfix.c40028f8f"
   test-kes:
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}

diff --git a/testing/common.sh b/testing/common.sh
@@ -572,13 +572,12 @@ function install_operator() {
     echo "Installing Current Operator with sts enabled"
     try kubectl apply -k "${SCRIPT_DIR}/../testing/sts/operator"
     try kubectl -n minio-operator set env deployment/minio-operator OPERATOR_SIDECAR_IMAGE="$SIDECAR_TAG"
-    echo "key, value for pod selector in kustomize test"
+    try kubectl -n minio-operator rollout status deployment/minio-operator
     key=name
     value=minio-operator
   elif [ "$1" = "certmanager" ]; then
     echo "Installing Current Operator with certmanager"
     try kubectl apply -k "${SCRIPT_DIR}/../testing/certmanager/operator"
-    echo "key, value for pod selector in kustomize test"
     key=name
     value=minio-operator
   else
@@ -596,18 +595,12 @@ function install_operator() {
     # and then we change the images, no need to have more overlays in different folders.
     try kubectl -n minio-operator set image deployment/minio-operator minio-operator="$TAG"
     try kubectl -n minio-operator set env deployment/minio-operator OPERATOR_SIDECAR_IMAGE="$SIDECAR_TAG"
-
     try kubectl -n minio-operator rollout status deployment/minio-operator
 
-    echo "key, value for pod selector in kustomize test"
     key=name
     value=minio-operator
   fi
 
-  # Reusing the wait for both, Kustomize and Helm
-  echo "Waiting for k8s api"
-  sleep 10
-
   kubectl get ns
 
   kubectl -n minio-operator get deployments
@@ -692,11 +685,8 @@ function check_tenant_status() {
   key=v1.min.io/tenant
   value=$2
   if [ $# -ge 3 ]; then
-    echo "Third argument provided, then set key value"
     key=app
     value=$3
-  else
-    echo "No third argument provided, using default key"
   fi
 
   wait_resource_status $1 Tenant $2 600

diff --git a/tests/common.sh b/tests/common.sh
diff --git a/tests/start-tests-tenant.sh b/tests/start-tests-tenant.sh