add cleanup

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>

Author: nevermarine

.github/workflows/dev_module_build.yml

@@ -551,6 +551,13 @@ jobs:
         run: |
           task run -v
 
+      - name: Cleanup E2E resources on cancel
+        if: always() && (steps.e2e-tests.outcome == 'cancelled' || steps.e2e-tests.outcome == 'failure')
+        id: e2e-tests-cleanup
+        working-directory: ./tests/e2e/
+        run: |
+          task cleanup
+
   last_comment:
     name: Update comment on finish
     needs:

tests/e2e/Taskfile.yaml

@@ -104,3 +104,16 @@ tasks:
           {{if .FOCUS -}}
           --focus "{{ .FOCUS }}"
           {{end}}
+  cleanup:
+    desc: "Cleanup namespaces & resources left from e2e tests"
+    deps:
+      - kubectl
+      - d8
+    cmds: 
+      - |
+        E2E_PREFIX=head-$(git rev-parse --short HEAD)
+        readarray -t CLEANUP_RESOURCES < <(yq .cleanupResources[] default_config.yaml)
+        for RESOURCE in "${CLEANUP_RESOURCES[@]}"; do 
+            kubectl get $RESOURCE --no-headers | awk "/$E2E_PREFIX/{print \$1}" | xargs kubectl delete $RESOURCE 
+        done
+        kubectl get namespaces --no-headers | awk "/$E2E_PREFIX/{print \$1}" | xargs kubectl delete namespaces

tests/e2e/config/config.go

@@ -131,6 +131,7 @@ type Config struct {
 	Namespace        string           `yaml:"namespaceSuffix"`
 	TestData         TestData         `yaml:"testData"`
 	LogFilter        []string         `yaml:"logFilter"`
+	CleanupResources []string         `yaml:"cleanupResources"`
 	RegexpLogFilter  []regexp.Regexp  `yaml:"regexpLogFilter"`
 	StorageClass     StorageClass
 }

tests/e2e/default_config.yaml

@@ -52,6 +52,11 @@ logFilter:
   - "get storage class specified in spec: storage class not found" # Err.
   - "lastTransitionTime: Required value" # Err.
   - "virtualmachineipaddressleases.virtualization.deckhouse.io "
-regexpLogFilter:
   - "failed to detach: .* not found" # "err" "failed to detach: virtualmachine.kubevirt.io \"head-497d17b-vm-automatic-with-hotplug\" not found",
   - "error patching .* not found" # "err" "error patching *** virtualimages.virtualization.deckhouse.io \"head-497d17b-vi-pvc-oref-vi-oref-vd\" not found",
+
+cleanupResources:
+  - clustervirtualimages.virtualization.deckhouse.io
+  - virtualmachineclasses.virtualization.deckhouse.io
+  - replicatedstorageclasses.storage.deckhouse.io
+  - virtualmachineipaddressleases.virtualization.deckhouse.io

tests/e2e/tests_suite_test.go

@@ -210,26 +210,19 @@ func Cleanup() []error {
 			continue
 		}
 	}
-
-	res = kubectl.Delete(kc.DeleteOptions{
-		IgnoreNotFound: true,
-		Labels:         map[string]string{"id": namePrefix},
-		Resource:       kc.ResourceCVI,
-	})
-	if res.Error() != nil {
-		cleanupErrs = append(
-			cleanupErrs, fmt.Errorf("cmd: %s\nstderr: %s", res.GetCmd(), res.StdErr()),
-		)
-	}
-	res = kubectl.Delete(kc.DeleteOptions{
-		IgnoreNotFound: true,
-		Labels:         map[string]string{"id": namePrefix},
-		Resource:       kc.ResourceVMClass,
-	})
-	if res.Error() != nil {
-		cleanupErrs = append(
-			cleanupErrs, fmt.Errorf("cmd: %s\nstderr: %s", res.GetCmd(), res.StdErr()),
-		)
+	
+	for _, r := range conf.CleanupResources {
+		res = kubectl.Delete(kc.DeleteOptions{
+			IgnoreNotFound: true,
+			Labels:         map[string]string{"id": namePrefix},
+			Resource: 		kc.Resource(r),
+		})
+		if res.Error() != nil {
+			cleanupErrs = append(
+				cleanupErrs, fmt.Errorf("cmd: %s\nstderr: %s", res.GetCmd(), res.StdErr()),
+			)
+			continue
+		}
 	}
 
 	return cleanupErrs