Cleanup CommonBeforeSuite (#96)

Signed-off-by: Parthvi <[email protected]>
rancher · May 2, 2024 · 9df8c7f · 9df8c7f
1 parent 368116d
commit 9df8c7f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 22 deletions.
diff --git a/hosted/aks/k8s_chart_support/k8s_chart_support_suite_test.go b/hosted/aks/k8s_chart_support/k8s_chart_support_suite_test.go
@@ -40,8 +40,7 @@ var _ = BeforeSuite(func() {
 
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient, ctx.CloudCred.ID, location)
 	Expect(err).To(BeNil())

diff --git a/hosted/aks/p0/p0_suite_test.go b/hosted/aks/p0/p0_suite_test.go
@@ -44,8 +44,7 @@ func TestP0(t *testing.T) {
 
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient, ctx.CloudCred.ID, location)
 	Expect(err).To(BeNil())

diff --git a/hosted/aks/support_matrix/support_matrix_suite_test.go b/hosted/aks/support_matrix/support_matrix_suite_test.go
@@ -35,8 +35,7 @@ var (
 func TestSupportMatrix(t *testing.T) {
 	RegisterFailHandler(Fail)
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	availableVersionList, err = helper.ListSingleVariantAKSAvailableVersions(ctx.RancherClient, ctx.CloudCred.ID, location)
 	Expect(err).To(BeNil())
 	RunSpecs(t, "SupportMatrix Suite")

diff --git a/hosted/eks/k8s_chart_support/k8s_chart_support_suite_test.go b/hosted/eks/k8s_chart_support/k8s_chart_support_suite_test.go
@@ -40,8 +40,7 @@ var _ = BeforeSuite(func() {
 
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient)

diff --git a/hosted/eks/p0/p0_suite_test.go b/hosted/eks/p0/p0_suite_test.go
@@ -45,8 +45,7 @@ func TestP0(t *testing.T) {
 
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient)
 	Expect(err).To(BeNil())

diff --git a/hosted/eks/support_matrix/support_matrix_suite_test.go b/hosted/eks/support_matrix/support_matrix_suite_test.go
@@ -36,8 +36,7 @@ var (
 func TestSupportMatrix(t *testing.T) {
 	RegisterFailHandler(Fail)
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	availableVersionList, err = kubernetesversions.ListEKSAllVersions(ctx.RancherClient)
 	Expect(err).To(BeNil())
 	Expect(availableVersionList).ToNot(BeEmpty())

diff --git a/hosted/gke/k8s_chart_support/k8s_chart_support_suite_test.go b/hosted/gke/k8s_chart_support/k8s_chart_support_suite_test.go
@@ -39,8 +39,7 @@ var _ = BeforeSuite(func() {
 })
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient, project, ctx.CloudCred.ID, zone, "")

diff --git a/hosted/gke/p0/p0_suite_test.go b/hosted/gke/p0/p0_suite_test.go
@@ -46,8 +46,7 @@ func TestP0(t *testing.T) {
 
 var _ = BeforeEach(func() {
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	clusterName = namegen.AppendRandomString(helpers.ClusterNamePrefix)
 	k8sVersion, err = helper.GetK8sVersion(ctx.RancherClient, project, ctx.CloudCred.ID, zone, "")
 	Expect(err).To(BeNil())

diff --git a/hosted/gke/support_matrix/support_matrix_suite_test.go b/hosted/gke/support_matrix/support_matrix_suite_test.go
@@ -36,8 +36,7 @@ var (
 func TestSupportMatrix(t *testing.T) {
 	RegisterFailHandler(Fail)
 	var err error
-	ctx, err = helpers.CommonBeforeSuite(helpers.Provider)
-	Expect(err).To(BeNil())
+	ctx = helpers.CommonBeforeSuite(helpers.Provider)
 	availableVersionList, err = helper.ListSingleVariantGKEAvailableVersions(ctx.RancherClient, project, ctx.CloudCred.ID, zone, "")
 	Expect(err).To(BeNil())
 	RunSpecs(t, "SupportMatrix Suite")

diff --git a/hosted/helpers/helper_common.go b/hosted/helpers/helper_common.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"os/user"
-	"strconv"
 	"strings"
 
 	"github.com/onsi/ginkgo/v2"
@@ -25,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func CommonBeforeSuite(cloud string) (Context, error) {
+func CommonBeforeSuite(cloud string) Context {
 
 	rancherConfig := new(rancher.Config)
 	Eventually(rancherConfig, "10s").ShouldNot(BeNil())
@@ -83,13 +82,12 @@ func CommonBeforeSuite(cloud string) (Context, error) {
 		Expect(err).To(BeNil())
 	}
 
-	clusterCleanup, _ := strconv.ParseBool(os.Getenv("DOWNSTREAM_CLUSTER_CLEANUP"))
 	return Context{
 		CloudCred:      cloudCredential,
 		RancherClient:  rancherClient,
 		Session:        testSession,
 		ClusterCleanup: clusterCleanup,
-	}, nil
+	}
 }
 
 // WaitUntilClusterIsReady waits until the cluster is in a Ready state,