Add more incremental backup tests with Spaces

Author: valmiranogueira

e2e-tests/tests/demand-backup-incremental/06-create-incremental-backup.yaml

@@ -9,5 +9,7 @@ commands:
       source ../../functions
 
       # Gets first storage defined and run backup
-      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml | yq '(.spec.backup.storages // {}) | keys | .[0]')
+      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml \
+        | yq '(.spec.backup.storages // {}) | keys | .[0]')
+
       run_backup incr-1 $storage_name "$(get_cluster_name)" "incremental"

e2e-tests/tests/demand-backup-incremental/08-create-incremental-backup.yaml

@@ -9,5 +9,7 @@ commands:
       source ../../functions
 
       # Gets first storage defined and run backup
-      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml | yq '(.spec.backup.storages // {}) | keys | .[0]')
+      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml \
+        | yq '(.spec.backup.storages // {}) | keys | .[0]')
+
       run_backup incr-2 $storage_name "$(get_cluster_name)" "incremental"

e2e-tests/tests/demand-backup-incremental/10-create-incremental-backup.yaml

@@ -9,5 +9,7 @@ commands:
       source ../../functions
 
       # Gets first storage defined and run backup
-      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml | yq '(.spec.backup.storages // {}) | keys | .[0]')
+      storage_name=$(kubectl get ps demand-backup-incremental -n ${NAMESPACE} -o yaml \
+        | yq '(.spec.backup.storages // {}) | keys | .[0]')
+
       run_backup incr-3 $storage_name "$(get_cluster_name)" "incremental"

e2e-tests/tests/gr-demand-backup-incremental/00-assert.yaml

@@ -2,8 +2,25 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 150
 ---
-apiVersion: v1
-kind: Secret
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
-  name: minio-secret
-type: Opaque
+  name: perconaservermysqls.ps.percona.com
+spec:
+  group: ps.percona.com
+  names:
+    kind: PerconaServerMySQL
+    listKind: PerconaServerMySQLList
+    plural: perconaservermysqls
+    shortNames:
+    - ps
+    singular: perconaservermysql
+  scope: Namespaced
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: check-operator-deploy-status
+timeout: 120
+commands:
+  - script: kubectl assert exist-enhanced deployment percona-server-mysql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1

…ckup-incremental/01-deploy-operator.yaml …ckup-incremental/00-deploy-operator.yamle2e-tests/tests/gr-scheduled-backup-incremental/01-deploy-operator.yaml renamed to e2e-tests/tests/gr-demand-backup-incremental/00-deploy-operator.yaml e2e-tests/tests/gr-scheduled-backup-incremental/01-deploy-operator.yaml renamed to e2e-tests/tests/gr-demand-backup-incremental/00-deploy-operator.yaml

@@ -12,5 +12,7 @@ commands:
       deploy_operator
       deploy_tls_cluster_secrets
       deploy_client
-      deploy_minio
+      if has_minio_storage; then
+        deploy_minio
+      fi
     timeout: 300

e2e-tests/tests/gr-demand-backup-incremental/00-minio-secret.yaml

@@ -1,26 +1,54 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 150
+timeout: 600
 ---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
+kind: StatefulSet
+apiVersion: apps/v1
 metadata:
-  name: perconaservermysqls.ps.percona.com
-spec:
-  group: ps.percona.com
-  names:
-    kind: PerconaServerMySQL
-    listKind: PerconaServerMySQLList
-    plural: perconaservermysqls
-    shortNames:
-    - ps
-    singular: perconaservermysql
-  scope: Namespaced
+  name: gr-demand-backup-incremental-mysql
+status:
+  observedGeneration: 1
+  replicas: 3
+  readyReplicas: 3
+  currentReplicas: 3
+  updatedReplicas: 3
+  collisionCount: 0
 ---
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
+kind: Deployment
+apiVersion: apps/v1
 metadata:
-  name: check-operator-deploy-status
-timeout: 120
-commands:
-  - script: kubectl assert exist-enhanced deployment percona-server-mysql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1
+  name: gr-demand-backup-incremental-router
+status:
+  observedGeneration: 1
+  replicas: 3
+  readyReplicas: 3
+  updatedReplicas: 3
+---
+apiVersion: ps.percona.com/v1
+kind: PerconaServerMySQL
+metadata:
+  name: gr-demand-backup-incremental
+spec:
+  backup:
+    backoffLimit: 3
+status:
+  conditions:
+  - reason: Initializing
+    status: "False"
+    type: Initializing
+  - reason: Ready
+    status: "True"
+    type: Ready
+  - message: InnoDB cluster successfully bootstrapped with 3 nodes
+    reason: InnoDBClusterBootstrapped
+    status: "True"
+    type: InnoDBClusterBootstrapped
+  mysql:
+    ready: 3
+    size: 3
+    state: ready
+  router:
+    ready: 3
+    size: 3
+    state: ready
+  state: ready

e2e-tests/tests/gr-demand-backup-incremental/01-assert.yaml

@@ -0,0 +1,10 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      get_cr | kubectl -n "${NAMESPACE}" apply -f -