K8SPG-647: Fix major-upgrade test

Author: egegunes

e2e-tests/tests/major-upgrade/10-assert.yaml

@@ -5,6 +5,23 @@ commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job
     sleep 5
+
+    primary=$(kubectl -n ${NAMESPACE} get pod -l postgres-operator.crunchydata.com/role=master --no-headers -o jsonpath={.items[].metadata.name} || true)
+    if [ -z ${primary} ]; then
+            echo "Waiting for pods"
+            exit 0
+    fi
+
+    phase=$(kubectl -n ${NAMESPACE} get pod/${primary} -o jsonpath={".status.phase"})
+    if [[ "${phase}" != "Running" ]]; then
+            echo "Waiting for ${primary} to start running"
+            exit 0
+    fi
+
+    kubectl -n ${NAMESPACE} exec -it ${primary} -- patronictl list
+    kubectl -n ${NAMESPACE} exec -it ${primary} -- patronictl history
+
+    sleep 10
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster

e2e-tests/tests/major-upgrade/11-assert.yaml

@@ -0,0 +1,16 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
+
+      sleep 300
+
+      for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
+              echo "Checking the status of ${pod}:"
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT version()"
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT timeline_id FROM pg_control_checkpoint()"
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- pgbackrest --stanza=db --log-level-console=detail check
+      done

e2e-tests/tests/major-upgrade/11-change-repo.yaml

@@ -9,7 +9,7 @@ metadata:
     postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-12-to-13
   labels:
     postgres-operator.crunchydata.com/pgbackrest-backup: manual
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup
@@ -24,7 +24,7 @@ metadata:
   name: backup-after-12-to-13
 spec:
   pgCluster: major-upgrade
-  repoName: repo2
+  repoName: repo1
   options:
     - --type=full
 status:

e2e-tests/tests/major-upgrade/11-wait.yaml

@@ -4,6 +4,6 @@ metadata:
   name: backup-after-12-to-13
 spec:
   pgCluster: major-upgrade
-  repoName: repo2
+  repoName: repo1
   options:
     - --type=full

e2e-tests/tests/major-upgrade/12-assert.yaml

@@ -0,0 +1,9 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
+
+      sleep 30

e2e-tests/tests/major-upgrade/12-run-backup.yaml

@@ -30,7 +30,7 @@ metadata:
   name: restore-after-12-to-13
 spec:
   pgCluster: major-upgrade
-  repoName: repo2
+  repoName: repo1
 status:
   state: Succeeded
 ---

e2e-tests/tests/major-upgrade/13-wait.yaml

@@ -4,4 +4,4 @@ metadata:
   name: restore-after-12-to-13
 spec:
   pgCluster: major-upgrade
-  repoName: repo2
+  repoName: repo1