K8SPG-604: fix scheduled backup (#910)

Author: eleo007

e2e-tests/tests/scheduled-backup/01-assert.yaml

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

e2e-tests/tests/scheduled-backup/06-assert.yaml

@@ -9,9 +9,6 @@ metadata:
 spec:
   pgCluster: scheduled-backup
   repoName: repo2
-status:
-  backupType: full
-  state: Succeeded
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
@@ -34,11 +31,3 @@ spec:
 status:
   backupType: full
   state: Succeeded
----
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
-metadata:
-  name: scheduled-backup
-  generation: 6
-status:
-  observedGeneration: 6

e2e-tests/tests/scheduled-backup/06-engage-gcs.yaml

@@ -15,7 +15,7 @@ spec:
             bucket: pg-operator-testing
           name: repo2
           schedules:
-            full: "*/5 * * * *"
+            full: "*/1 * * * *"
         - azure:
             container: pg-operator-testing
           name: repo3

e2e-tests/tests/scheduled-backup/07-assert.yaml

@@ -2,20 +2,6 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
 ---
----
-kind: Job
-apiVersion: batch/v1
-metadata:
-  labels:
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
----
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
 metadata:
@@ -31,9 +17,6 @@ metadata:
 spec:
   pgCluster: scheduled-backup
   repoName: repo2
-status:
-  backupType: full
-  state: Succeeded
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
@@ -56,11 +39,4 @@ spec:
 status:
   backupType: full
   state: Succeeded
----
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
-metadata:
-  name: scheduled-backup
-  generation: 8
-status:
-  observedGeneration: 8
+

e2e-tests/tests/scheduled-backup/08-assert.yaml

@@ -15,6 +15,19 @@ metadata:
 status:
   succeeded: 1
 ---
+kind: Job
+apiVersion: batch/v1
+metadata:
+  labels:
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGBackup
+      controller: true
+      blockOwnerDeletion: true
+status:
+  succeeded: 1
+---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
 metadata:
@@ -26,6 +39,17 @@ status:
   backupType: full
   state: Succeeded
 ---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  generation: 1
+spec:
+  pgCluster: scheduled-backup
+  repoName: repo2
+status:
+  backupType: full
+  state: Succeeded
+---
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata: