system-test: Unify delete workload mechanism in ran du tests

Signed-off-by: Rodrigo Lopez <[email protected]>
openshift-kni · Jun 28, 2024 · f8c94ee · f8c94ee
1 parent 3d5944e
commit f8c94ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/tests/system-tests/ran-du/tests/launch-workload-multiple-iter-loadavg.go b/tests/system-tests/ran-du/tests/launch-workload-multiple-iter-loadavg.go
@@ -81,7 +81,7 @@ var _ = Describe(
 		})
 		AfterAll(func() {
 			By("Cleaning up test workload resources")
-			err := randutestworkload.CleanNameSpace(randuparams.DefaultTimeout, RanDuTestConfig.TestWorkload.Namespace)
-			Expect(err).ToNot(HaveOccurred(), "Failed to clean workload test namespace objects")
+			_, err := shell.ExecuteCmd(RanDuTestConfig.TestWorkload.DeleteShellCmd)
+			Expect(err).ToNot(HaveOccurred(), "Failed to delete workload")
 		})
 	})
diff --git a/tests/system-tests/ran-du/tests/stability-no-workload.go b/tests/system-tests/ran-du/tests/stability-no-workload.go
@@ -6,8 +6,10 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/openshift-kni/eco-goinfra/pkg/namespace"
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/internal/platform"
+	"github.com/openshift-kni/eco-gotests/tests/system-tests/internal/shell"
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/internal/stability"
 	. "github.com/openshift-kni/eco-gotests/tests/system-tests/ran-du/internal/randuinittools"
 )
@@ -23,6 +25,12 @@ var _ = Describe(
 		)
 		BeforeAll(func() {
 
+			if namespace.NewBuilder(APIClient, RanDuTestConfig.TestWorkload.Namespace).Exists() {
+				By("Cleaning up test workload resources")
+				_, err := shell.ExecuteCmd(RanDuTestConfig.TestWorkload.DeleteShellCmd)
+				Expect(err).ToNot(HaveOccurred(), "Failed to delete workload")
+			}
+
 			By("Fetching Cluster name")
 			clusterName, err = platform.GetOCPClusterName(APIClient)
 			Expect(err).ToNot(HaveOccurred(), "Failed to get cluster name")

diff --git a/tests/system-tests/ran-du/tests/stability-workload.go b/tests/system-tests/ran-du/tests/stability-workload.go
@@ -14,7 +14,6 @@ import (
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/internal/stability"
 	. "github.com/openshift-kni/eco-gotests/tests/system-tests/ran-du/internal/randuinittools"
 	"github.com/openshift-kni/eco-gotests/tests/system-tests/ran-du/internal/randuparams"
-	"github.com/openshift-kni/eco-gotests/tests/system-tests/ran-du/internal/randutestworkload"
 )
 
 var _ = Describe(
@@ -131,7 +130,7 @@ var _ = Describe(
 		})
 		AfterAll(func() {
 			By("Cleaning up test workload resources")
-			err := randutestworkload.CleanNameSpace(randuparams.DefaultTimeout, RanDuTestConfig.TestWorkload.Namespace)
-			Expect(err).ToNot(HaveOccurred(), "Failed to clean workload test namespace objects")
+			_, err := shell.ExecuteCmd(RanDuTestConfig.TestWorkload.DeleteShellCmd)
+			Expect(err).ToNot(HaveOccurred(), "Failed to delete workload")
 		})
 	})