Fix logging stack events logic (#6649)

eksctl-io · May 29, 2023 · 6214467 · 6214467
1 parent aa4e3b4
commit 6214467
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/integration/tests/inferentia/inferentia_test.go b/integration/tests/inferentia/inferentia_test.go
@@ -24,8 +24,6 @@ import (
 )
 
 var (
-	defaultCluster          string
-	noInstallCluster        string
 	params                  *tests.Params
 	clusterWithNeuronPlugin string
 	clusterWithoutPlugin    string
@@ -35,8 +33,8 @@ func init() {
 	// Call testing.Init() prior to tests.NewParams(), as otherwise -test.* will not be recognised. See also: https://golang.org/doc/go1.13#testing
 	testing.Init()
 	params = tests.NewParams("inf1")
-	defaultCluster = params.ClusterName
-	noInstallCluster = params.NewClusterName("inf1-no-plugin")
+	clusterWithNeuronPlugin = params.ClusterName
+	clusterWithoutPlugin = params.NewClusterName("inf1-no-plugin")
 }
 
 func TestInferentia(t *testing.T) {
@@ -54,9 +52,6 @@ var _ = BeforeSuite(func() {
 		params.KubeconfigTemp = true
 	}
 
-	clusterWithoutPlugin = noInstallCluster
-	clusterWithNeuronPlugin = defaultCluster
-
 	if !params.SkipCreate {
 		cmd := params.EksctlCreateCmd.WithArgs(
 			"cluster",
@@ -137,7 +132,7 @@ var _ = Describe("(Integration) Inferentia nodes", func() {
 			})
 
 			When("adding an unmanaged nodegroup by default", func() {
-				params.LogStacksEventsOnFailure()
+				params.LogStacksEventsOnFailureForCluster(clusterWithoutPlugin)
 				It("should install without error", func() {
 					cmd := params.EksctlCreateCmd.WithArgs(
 						"nodegroup",

diff --git a/integration/tests/trainium/trainium_test.go b/integration/tests/trainium/trainium_test.go
@@ -30,8 +30,6 @@ import (
 )
 
 var (
-	defaultCluster          string
-	noInstallCluster        string
 	params                  *tests.Params
 	clusterWithNeuronPlugin string
 	clusterWithoutPlugin    string
@@ -43,8 +41,8 @@ func init() {
 	// Call testing.Init() prior to tests.NewParams(), as otherwise -test.* will not be recognised. See also: https://golang.org/doc/go1.13#testing
 	testing.Init()
 	params = tests.NewParams("trn1")
-	defaultCluster = params.ClusterName
-	noInstallCluster = params.NewClusterName("trn1-no-plugin")
+	clusterWithNeuronPlugin = params.ClusterName
+	clusterWithoutPlugin = params.NewClusterName("trn1-no-plugin")
 }
 
 func TestTrainium(t *testing.T) {
@@ -62,9 +60,6 @@ var _ = BeforeSuite(func() {
 		params.KubeconfigTemp = true
 	}
 
-	clusterWithoutPlugin = noInstallCluster
-	clusterWithNeuronPlugin = defaultCluster
-
 	if !params.SkipCreate {
 		cfg := NewConfig(params.Region)
 		ctx := context.Background()