WIP

Author: egegunes

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

@@ -4,7 +4,20 @@ timeout: 360
 commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job
+    #
+    # for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/pgupgrade=13-to-14 | awk '{print $1}'); do
+    #   echo "${pod} logs:"
+    #   kubectl -n ${NAMESPACE} logs ${pod}
+    # done
+    #
     sleep 5
+collectors:
+- type: pod
+  selector: "postgres-operator.crunchydata.com/data=postgres"
+  tail: 30
+- type: pod
+  selector: "postgres-operator.crunchydata.com/pgupgrade=13-to-14"
+  tail: 200
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster

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

@@ -7,6 +7,11 @@ commands:
 
       kubectl -n ${NAMESPACE} get pod
 
+      # for pod in $(kubectl -n ${NAMESPACE} get pod -l job-name=major-upgrade-pgbackrest-restore | awk '{print $1}'); do
+      #   echo "${pod} logs:"
+      #   kubectl -n ${NAMESPACE} logs ${pod}
+      # done
+      #
       for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
               phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"})
               if [[ "${phase}" != "Running" ]]; then
@@ -18,11 +23,14 @@ commands:
                       | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
       done
 
-      sleep 30
+      sleep 15
 collectors:
 - type: pod
   selector: "postgres-operator.crunchydata.com/data=postgres"
   tail: 30
+- type: pod
+  selector: "job-name=major-upgrade-pgbackrest-restore"
+  tail: 300
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGRestore

e2e-tests/tests/major-upgrade/28-run-restore.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   pgCluster: major-upgrade
   repoName: repo1
+  options:
+  - --log-level-console=debug

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

@@ -5,6 +5,13 @@ commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job
     sleep 5
+collectors:
+- type: pod
+  selector: "postgres-operator.crunchydata.com/data=postgres"
+  tail: 30
+- type: pod
+  selector: "postgres-operator.crunchydata.com/pgupgrade=13-to-14"
+  tail: 200
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster

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

@@ -18,11 +18,14 @@ commands:
                       | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
       done
 
-      sleep 30
+      sleep 15
 collectors:
 - type: pod
   selector: "postgres-operator.crunchydata.com/data=postgres"
   tail: 30
+- type: pod
+  selector: "job-name=major-upgrade-pgbackrest-restore"
+  tail: 300
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGRestore

e2e-tests/tests/major-upgrade/38-run-restore.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   pgCluster: major-upgrade
   repoName: repo1
+  options:
+  - --log-level-console=debug

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

@@ -5,6 +5,13 @@ commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job
     sleep 5
+collectors:
+- type: pod
+  selector: "postgres-operator.crunchydata.com/data=postgres"
+  tail: 30
+- type: pod
+  selector: "postgres-operator.crunchydata.com/pgupgrade=13-to-14"
+  tail: 200
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster

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

@@ -18,11 +18,14 @@ commands:
                       | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
       done
 
-      sleep 30
+      sleep 15
 collectors:
 - type: pod
   selector: "postgres-operator.crunchydata.com/data=postgres"
   tail: 30
+- type: pod
+  selector: "job-name=major-upgrade-pgbackrest-restore"
+  tail: 300
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGRestore

e2e-tests/tests/major-upgrade/48-run-restore.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   pgCluster: major-upgrade
   repoName: repo1
+  options:
+  - --log-level-console=debug

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

@@ -5,6 +5,13 @@ commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job
     sleep 5
+collectors:
+- type: pod
+  selector: "postgres-operator.crunchydata.com/data=postgres"
+  tail: 30
+- type: pod
+  selector: "postgres-operator.crunchydata.com/pgupgrade=13-to-14"
+  tail: 200
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster

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

@@ -18,11 +18,14 @@ commands:
                       | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null
       done
 
-      sleep 30
+      sleep 15
 collectors:
 - type: pod
   selector: "postgres-operator.crunchydata.com/data=postgres"
   tail: 30
+- type: pod
+  selector: "job-name=major-upgrade-pgbackrest-restore"
+  tail: 300
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGRestore

e2e-tests/tests/major-upgrade/58-run-restore.yaml

@@ -5,3 +5,5 @@ metadata:
 spec:
   pgCluster: major-upgrade
   repoName: repo1
+  options:
+  - --log-level-console=debug

e2e-tests/tests/major-upgrade/59-read-from-primary.yaml

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 49-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 59-read-from-primary --from-literal=data="${data}"