WIP

Author: egegunes

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

@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 240
+timeout: 300
 ---
 kind: StatefulSet
 apiVersion: apps/v1

e2e-tests/tests/major-upgrade/01-create-cluster.yaml

@@ -14,7 +14,5 @@ commands:
           .spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" |
           .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" |
           .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbouncer" |
-          .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbackrest" |
-          .spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = "pg_cron" |
-          .spec.extensions.custom += [{"name": "pg_cron", "version": "1.6.1"}]' \
+          .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbackrest"' \
         | kubectl -n "${NAMESPACE}" apply -f -

e2e-tests/tests/major-upgrade/02-write-data.yaml

@@ -14,7 +14,3 @@ commands:
       run_psql_local \
         '\c myapp \\\ INSERT INTO myApp (id) VALUES (100500)' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
-
-      run_psql_local \
-        '\c postgres \\\ CREATE EXTENSION pg_cron' \
-        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"

e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml

@@ -6,13 +6,9 @@ commands:
       set -o errexit
       set -o xtrace
 
-<<<<<<< HEAD:e2e-tests/tests/major-upgrade/31-wait.yaml
-      sleep 30
-=======
       source ../../functions
 
       sleep 90 # wait some time for stanza to upgrade
->>>>>>> 99139337e (fixes):e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml
 
       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}:"

e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml

@@ -6,13 +6,9 @@ commands:
       set -o errexit
       set -o xtrace
 
-<<<<<<< HEAD:e2e-tests/tests/major-upgrade/11-wait.yaml
-      sleep 30
-=======
       source ../../functions
 
       sleep 90
->>>>>>> 99139337e (fixes):e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml
 
       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}:"

e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml

@@ -6,13 +6,9 @@ commands:
       set -o errexit
       set -o xtrace
 
-<<<<<<< HEAD:e2e-tests/tests/major-upgrade/21-wait.yaml
-      sleep 30
-=======
       source ../../functions
 
       sleep 90
->>>>>>> 99139337e (fixes):e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml
 
       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}:"

e2e-tests/tests/scheduled-backup/07-add-sleep.yaml

@@ -1,14 +1,8 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-<<<<<<< HEAD:e2e-tests/tests/scheduled-backup/07-add-sleep.yaml
   - script: |-
       set -o errexit
       set -o xtrace
 
       sleep 2
-=======
-  - timeout: 600
-    script: |-
-      sleep 60
->>>>>>> 99139337e (fixes):e2e-tests/tests/major-upgrade/13-wait.yaml