From 94eaa688188a5ef9bec8dd75371abcf6082dab44 Mon Sep 17 00:00:00 2001
From: AnieeG <anindita.ghosh@smartcontract.com>
Date: Mon, 18 Sep 2023 11:42:43 -0700
Subject: [PATCH] namespace changes

---
 integration-tests/load/helper.go     | 2 +-
 integration-tests/testsetups/ccip.go | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/integration-tests/load/helper.go b/integration-tests/load/helper.go
index 660df871fa..79b810497f 100644
--- 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
index 98cd7d8047..ac872e0155 100644
--- 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])
 		}
 	}