namespace changes

smartcontractkit · Sep 18, 2023 · 94eaa68 · 94eaa68
1 parent 8081902
commit 94eaa68
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/integration-tests/load/helper.go b/integration-tests/load/helper.go
@@ -181,7 +181,7 @@ func (l *loadArgs) Start() {
 
 				ccipLoad := NewCCIPLoad(l.TestCfg.Test, lane, l.TestCfg.PhaseTimeout, 100000, lane.Reports)
 				ccipLoad.BeforeAllCall(l.TestCfg.MsgType)
-				if lane.TestEnv != nil && lane.TestEnv.K8Env != nil && lane.TestEnv.K8Env.Cfg != nil {
+				if namespace == "" && lane.TestEnv != nil && lane.TestEnv.K8Env != nil && lane.TestEnv.K8Env.Cfg != nil {
 					namespace = lane.TestEnv.K8Env.Cfg.Namespace
 				}
 

diff --git a/integration-tests/testsetups/ccip.go b/integration-tests/testsetups/ccip.go
@@ -11,7 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/smartcontractkit/chainlink-env/client"
@@ -427,8 +426,6 @@ func NewCCIPTestConfig(t *testing.T, lggr zerolog.Logger, tType string) *CCIPTes
 		envName, _ := utils.GetEnv("CCIP_EXISTING_ENV")
 		if envName != "" {
 			p.ExistingEnv = envName
-		} else {
-			p.ExistingEnv = fmt.Sprintf("Existing-Deployment-%s", uuid.NewString()[0:5])
 		}
 	}