fix monitoring test

Author: jvpasinatto

e2e-tests/tests/monitoring/03-assert.yaml

@@ -24,6 +24,5 @@ commands:
 
       retry 30 10 bash -c '
         kubectl -n "'"${NAMESPACE}"'" get pg-backup \
-          -l postgres-operator.crunchydata.com/cluster=monitoring,postgres-operator.crunchydata.com/pgbackrest-backup=replica-create \
           -o jsonpath="{.items[*].status.state}" | grep -qw Succeeded
       '

e2e-tests/tests/monitoring/03-create-cluster.yaml

@@ -1,8 +1,8 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
-timeout: 10
 commands:
-  - script: |-
+  - timeout: 120
+    script: |-
       set -o errexit
       set -o xtrace
 

e2e-tests/tests/operator-upgrade-extensions/00-assert.yaml

@@ -4,5 +4,25 @@ metadata:
   name: check-operator-and-minio
 timeout: 180
 commands:
-  - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1
-  - script: kubectl assert exist-enhanced deployment minio-service -n ${NAMESPACE} --field-selector status.readyReplicas=1
+  - script: |
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
+      until kubectl assert exist-enhanced deployment percona-postgresql-operator \
+        -n "${OPERATOR_NS:-$NAMESPACE}" --field-selector status.readyReplicas=1; do
+        echo "Waiting for percona-postgresql-operator deployment"
+        sleep 5
+      done
+
+      until kubectl assert exist-enhanced deployment minio-service \
+        -n "${NAMESPACE}" --field-selector status.readyReplicas=1; do
+        echo "Waiting for minio-service deployment"
+        sleep 5
+      done

e2e-tests/tests/operator-upgrade-extensions/00-deploy-operator.yaml

@@ -7,6 +7,12 @@ commands:
       set -o xtrace
 
       source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       init_temp_dir # do this only in the first TestStep
 
       destroy_cert_manager

e2e-tests/tests/operator-upgrade-extensions/01-assert.yaml

@@ -1,13 +1,16 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
----
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGCluster
-metadata:
-  name: operator-upgrade-extensions
-status:
-  state: ready
-  postgres:
-    ready: 3
-    size: 3
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
+      wait_cluster_consistency operator-upgrade-extensions 60

e2e-tests/tests/operator-upgrade-extensions/01-create-cluster.yaml

@@ -8,6 +8,11 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       lower_ver="$(curl -s https://check.percona.com/versions/v1/pg-operator | jq -r '.versions[].operator' | sort -V | tail -n1)"
       curl -s "https://raw.githubusercontent.com/percona/percona-postgresql-operator/v${lower_ver}/deploy/cr.yaml" >"${TEMP_DIR}/cr_lower.yaml"
 

e2e-tests/tests/operator-upgrade-extensions/02-add-custom-pg-cron.yaml

@@ -8,6 +8,11 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       kubectl -n "${NAMESPACE}" patch perconapgcluster ${test_name} --type merge -p '{
         "spec": {
           "extensions": {"custom": [{"name": "pg_cron", "version": "1.6.6"}]},

e2e-tests/tests/operator-upgrade-extensions/03-enable-extensions-and-write-data.yaml

@@ -8,6 +8,11 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       uri="postgres:$(get_psql_user_pass ${test_name}-pguser-postgres)@$(get_psql_user_host ${test_name}-pguser-postgres)"
 
       for ext in pg_stat_statements pgaudit vector pg_repack pg_cron; do

e2e-tests/tests/operator-upgrade-extensions/04-upgrade-operator.yaml

@@ -8,6 +8,11 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       snapshot_workload_revisions ${test_name} ${TEMP_DIR}/revisions.before
       date -u +%Y-%m-%dT%H:%M:%SZ > ${TEMP_DIR}/update_ts.txt
 

e2e-tests/tests/operator-upgrade-extensions/05-check-extensions-survived.yaml

@@ -8,6 +8,11 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping operator-upgrade-extensions on arm64: pg_cron-*-arm64.tar.gz is not in extension storage"
+        exit 0
+      fi
+
       wait_cluster_consistency ${test_name}
       assert_no_operator_rollout ${test_name} ${TEMP_DIR}/revisions.before