rearranged the tests

test/00-setup.yaml

@@ -1,72 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: demo
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: regcred
-  namespace: demo
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsidXNlcm5hbWUiOiJkZXNtbzk5OXIiLCJwYXNzd29yZCI6IlU5QXNlVGF5cUY5UlJCd0l2Q1k0IiwiZW1haWwiOiJqZWFubWFyYy5qaW0uYW5kcmVAZ21haWwuY29tIiwiYXV0aCI6IlpHVnpiVzg1T1RseU9sVTVRWE5sVkdGNWNVWTVVbEpDZDBsMlExazAifX19
----
-apiVersion: v1
-kind: Secret
-metadata:
-  namespace: demo
-  name: demo-chap-secret
-type: "kubernetes.io/iscsi-chap"
-data:
-  discovery.sendtargets.auth.username: ZGVtbw==
-  discovery.sendtargets.auth.password: VHJtK1lZaXZvMUNZSGszcGFGVWMrcTdCMmdJPQo=
-  node.session.auth.username: ZGVtbw==
-  node.session.auth.password: VHJtK1lZaXZvMUNZSGszcGFGVWMrcTdCMmdJPQo=
----
-apiVersion: v1
-kind: Secret
-metadata:
-  namespace: demo
-  name: with-envfrom-secret
-data:
-  title: dmVyeXNlY3JldA==
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: demo-pv
-  namespace: demo
-spec:
-  storageClassName: manual
-  capacity:
-    storage: 50Mi
-  accessModes:
-  - ReadWriteOnce
-  hostPath:
-    path: /tmp/demo
-    type: DirectoryOrCreate
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: demo-pvc
-  namespace: demo
-spec:
-  storageClassName: manual
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 50Mi
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: secret-minio
-  namespace: demo
-data:
-  RESTIC_PASSWORD: bHIyOXhtOTU=
-  AWS_ACCESS_KEY_ID: SjV4V2NqQ2RzckxpZ2lEZA==
-  AWS_SECRET_ACCESS_KEY: OVdBMnN1djVtanRLRTdnMkRjNWl5WWtkbDNobGV5UU8=

test/common/restoresession.yaml

@@ -10,22 +10,22 @@ spec:
         name: backup-demo
         namespace: demo
     status:
-      keep: ""
+      keep: last
-      startTime: "2023-03-20T20:47:08Z"
+      startTime: "2023-03-31T14:21:27Z"
       state: Success
       target:
       - backupType: Online
-        duration: 3.189468146s
+        duration: 1.734652641s
-        snapshotId: 4730eaad
+        snapshotId: 1d2baf88
-        startTime: "2023-03-20T20:47:08Z"
+        startTime: "2023-03-31T14:21:27Z"
         state: Success
         targetKind: Deployment
         targetName: apache-deployment
         try: 1
       - backupType: Job
-        duration: 7.509060051s
+        duration: 3.072021762s
-        snapshotId: 4ddc5da1
+        snapshotId: 748622a4
-        startTime: "2023-03-20T20:47:08Z"
+        startTime: "2023-03-31T14:21:27Z"
         state: Success
         targetKind: StatefulSet
         targetName: postgres-demo

test/common/setup.yaml

@@ -0,0 +1,32 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: demo
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: regcred
+  namespace: demo
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsidXNlcm5hbWUiOiJkZXNtbzk5OXIiLCJwYXNzd29yZCI6IlU5QXNlVGF5cUY5UlJCd0l2Q1k0IiwiZW1haWwiOiJqZWFubWFyYy5qaW0uYW5kcmVAZ21haWwuY29tIiwiYXV0aCI6IlpHVnpiVzg1T1RseU9sVTVRWE5sVkdGNWNVWTVVbEpDZDBsMlExazAifX19
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: demo
+  name: with-envfrom-secret
+data:
+  title: dmVyeXNlY3JldA==
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-minio
+  namespace: demo
+data:
+  RESTIC_PASSWORD: bHIyOXhtOTU=
+  AWS_ACCESS_KEY_ID: SjV4V2NqQ2RzckxpZ2lEZA==
+  AWS_SECRET_ACCESS_KEY: OVdBMnN1djVtanRLRTdnMkRjNWl5WWtkbDNobGV5UU8=

test/minikube/003-minio.yaml

@@ -0,0 +1 @@
+../common/minio.yaml

test/minikube/005-setup.yaml

@@ -0,0 +1 @@
+../common/setup.yaml

test/minikube/010-pvc.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: demo-pvc
+  namespace: demo
+spec:
+  storageClassName: manual
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Mi
+  storageClassName: csi-hostpath-sc

test/minikube/020-deployment.yaml

@@ -0,0 +1 @@
+../common/deployment.yaml

test/minikube/030-backupconf.yaml

@@ -0,0 +1 @@
+../common/backupconf.yaml

test/minikube/040-restoresession.yaml

@@ -0,0 +1 @@
+common/restoresession.yaml