From 5b93564d6e4fc6ceedc315c755d87cb6b817d231 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 13:21:25 +0200
Subject: [PATCH 01/26] Use test secrets

---
 integration-tests/ccip-tests/Makefile         | 21 +++---
 integration-tests/ccip-tests/README.md        | 20 +-----
 .../ccip-tests/testconfig/README.md           |  7 +-
 .../ccip-tests/testconfig/ccip.go             | 12 ++++
 .../testconfig/examples/.testsecrets.example  | 39 +++++++++++
 .../testconfig/examples/secrets.toml.example  | 52 ---------------
 .../ccip-tests/testconfig/global.go           | 65 ++++++++++++++-----
 integration-tests/go.mod                      |  4 +-
 integration-tests/go.sum                      |  2 -
 9 files changed, 116 insertions(+), 106 deletions(-)
 create mode 100644 integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
 delete mode 100644 integration-tests/ccip-tests/testconfig/examples/secrets.toml.example

diff --git a/integration-tests/ccip-tests/Makefile b/integration-tests/ccip-tests/Makefile
index 5a40f7ca0f..53a4cfc756 100644
--- a/integration-tests/ccip-tests/Makefile
+++ b/integration-tests/ccip-tests/Makefile
@@ -1,5 +1,5 @@
-## To Override the default config, and secret config:
-# example usage: make set_config override_toml=../config/config.toml secret_toml=../config/secret.toml network_config_toml=../config/network.toml
+## To Override the default config:
+# example usage: make set_config override_toml=../config/config.toml network_config_toml=../config/network.toml
 .PHONY: set_config
 set_config:
 	if [ -s "$(override_toml)" ]; then \
@@ -15,14 +15,15 @@ set_config:
       echo "export BASE64_NETWORK_CONFIG=$$(base64 -i $(network_config_toml))" >> ./testconfig/override/.env; \
     fi
 
-	@echo "setting secret config with $(secret_toml)"
-	@echo "export BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/.env
-	@echo "export TEST_BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/.env
-	@echo "BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" > ./testconfig/override/debug.env
-	@echo "TEST_BASE64_CCIP_SECRETS_CONFIG=$$(base64 -i $(secret_toml))" >> ./testconfig/override/debug.env
+	@echo "Checking for test secrets file in ~/.testsecrets...";
+	@if [ ! -f ~/.testsecrets ]; then \
+		echo "WARNING: ~/.testsecrets file not found. No test secrets will be set. To set test secrets, refer to ./testconfig/examples/.testsecrets.example for the list of secrets and instruction how to set them up."; \
+	else \
+		echo "Test secrets will be loaded from ~/.testsecrets file."; \
+	fi	
 
 
-# example usage: make test_load_ccip testimage=chainlink-ccip-tests:latest testname=TestLoadCCIPStableRPS override_toml=./testconfig/override/config.toml secret_toml=./testconfig/tomls/secrets.toml network_config_toml=../config/network.toml
+# example usage: make test_load_ccip testimage=chainlink-ccip-tests:latest testname=TestLoadCCIPStableRPS override_toml=./testconfig/override/config.toml network_config_toml=../config/network.toml
 .PHONY: test_load_ccip
 test_load_ccip: set_config
 	source ./testconfig/override/.env && \
@@ -36,7 +37,7 @@ test_load_ccip: set_config
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./load
 
 
-# example usage: make test_smoke_ccip testimage=chainlink-ccip-tests:latest testname=TestSmokeCCIPForBidirectionalLane override_toml=../testconfig/override/config.toml secret_toml=./testconfig/tomls/secrets.toml network_config_toml=../config/network.toml
+# example usage: make test_smoke_ccip testimage=chainlink-ccip-tests:latest testname=TestSmokeCCIPForBidirectionalLane override_toml=../testconfig/override/config.toml network_config_toml=../config/network.toml
 .PHONY: test_smoke_ccip
 test_smoke_ccip: set_config
 	source ./testconfig/override/.env && \
@@ -48,7 +49,7 @@ test_smoke_ccip: set_config
 	go test -timeout 24h -count=1 -v -run ^$(testname)$$ ./smoke
 
 # run ccip smoke tests with default config; explicitly sets the override config to empty
-# example usage: make test_smoke_ccip_default testname=TestSmokeCCIPForBidirectionalLane secret_toml=./testconfig/tomls/secrets.toml
+# example usage: make test_smoke_ccip_default testname=TestSmokeCCIPForBidirectionalLane
 .PHONY: test_smoke_ccip_default
 test_smoke_ccip_default: set_config
 	source ./testconfig/override/.env && \
diff --git a/integration-tests/ccip-tests/README.md b/integration-tests/ccip-tests/README.md
index 0e000561fa..fb7be0879c 100644
--- a/integration-tests/ccip-tests/README.md
+++ b/integration-tests/ccip-tests/README.md
@@ -34,30 +34,12 @@ For example, if you want to override the `Network` input in test and want to run
         export BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -i ./testconfig/override/mainnet.toml)
         ```
 
-3. Secrets - You also need to set some secrets. This is a mandatory step needed to run the tests. Please refer to [sample-secrets.toml](./testconfig/examples/secrets.toml.example) for the list of secrets that are mandatory to run the tests.
+3. Secrets - You also need to set some secrets. This is a mandatory step needed to run the tests. Please refer to [.testsecrets.example](./examples/.testsecrets.example) for the list of secrets and instruction how to set them up.
    - The chainlink image and tag are required secrets for all the tests.
    - If you are running tests in live networks like testnet and mainnet, you need to set the secrets (rpc urls and private keys) for the respective networks.
    - If you are running tests in simulated networks no network specific secrets are required.
    here is a sample secrets.toml file, for running the tests in simulated networks, with the chainlink image and tag set as secrets:
 
-   ```toml
-   [CCIP]
-   [CCIP.Env]
-   # ChainlinkImage is mandatory for all tests.
-   [CCIP.Env.NewCLCluster]
-   [CCIP.Env.NewCLCluster.Common]
-   [CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-   image = "chainlink-ccip"
-   version = "latest"
-   ```
-
-   We consider secrets similar to test input overrides and encode them using `base64` command.
-   Once you have the secrets.toml file, you can encode it using `base64` command (similar to step 2) and set the env var `BASE64_CCIP_SECRETS_CONFIG` with the encoded content.
-
-    ```bash
-        export BASE64_CCIP_SECRETS_CONFIG=$(base64 -i ./testconfig/tomls/secrets.toml)
-    ```
-
 **Please note that the secrets should NOT be checked in to the repo and should be kept locally.**
 
 We recommend against changing the content of [sample-secrets.toml](./testconfig/examples/secrets.toml.example). Please create a new file and set it as the secrets file.
diff --git a/integration-tests/ccip-tests/testconfig/README.md b/integration-tests/ccip-tests/testconfig/README.md
index 3f069934c4..48e33258cf 100644
--- a/integration-tests/ccip-tests/testconfig/README.md
+++ b/integration-tests/ccip-tests/testconfig/README.md
@@ -8,10 +8,9 @@ The test config is read in following order:
   - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_CONFIG_OVERRIDE` environment variable. 
   - The config mentioned in this file will override the default config.
   - Example override file - [override.toml.example](./examples/override.toml.example)
-- If there are sensitive details like private keys, credentials in test config, they can be specified in a separate secret file. 
-  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_SECRETS_CONFIG` environment variable. 
-  - The config mentioned in this file will override the default and override config.
-  - Example secret file - [secrets.toml.example](./examples/secrets.toml.example)
+- If there are sensitive details like private keys, credentials in test config, they can be specified in a separate dotenv file as env vars
+  - The `~/.testsecrets` file in home directory is automatically loaded and should have all test secrets as env vars  
+  - Example secret file - [.testsecrets.example](./examples/.testsecrets.example)
 
 ## CCIP.ContractVersions
 Specifies contract versions of different contracts to be referred by test.
diff --git a/integration-tests/ccip-tests/testconfig/ccip.go b/integration-tests/ccip-tests/testconfig/ccip.go
index 60d7055cb3..499bbe91ca 100644
--- a/integration-tests/ccip-tests/testconfig/ccip.go
+++ b/integration-tests/ccip-tests/testconfig/ccip.go
@@ -387,6 +387,18 @@ type CCIP struct {
 	Groups           map[string]*CCIPTestGroupConfig              `toml:",omitempty"`
 }
 
+// LoadFromEnv loads selected env vars into the CCIP config
+func (c *CCIP) LoadFromEnv() error {
+	if c.Env == nil {
+		c.Env = &Common{}
+	}
+	err := c.Env.LoadFromEnv()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *CCIP) Validate() error {
 	if c.Env != nil {
 		err := c.Env.Validate()
diff --git a/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
new file mode 100644
index 0000000000..567a15b054
--- /dev/null
+++ b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
@@ -0,0 +1,39 @@
+# DO NOT UPDATE THIS FILE WITH ANY SECRET VALUES.
+# This file serves as a template for the actual ~/.testsecrets file. Follow these steps to use it:
+# 1. Create a copy of this template in your home directory under ~/.testsecrets
+# 2. Update ~/.testsecrets with actual secret values required for your tests. The file will be automatically loaded by the test framework
+# 3. Only include secrets necessary for the tests you are running. For example, if you are only running tests on Ethereum Mainnet, you do not need secrets for Base Mainnet. Comment other env vars.
+# DO NOT COMMIT THE ACTUAL SECRETS FILE TO THE REPOSITORY.
+
+# Chainlink image used for NewCLCluster
+E2E_TEST_CHAINLINK_IMAGE="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
+
+# Chainlink upgrade image for NewCLCluster. Used only for upgrade tests
+E2E_TEST_CHAINLINK_UPGRADE_IMAG="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
+
+# Ethereum network secrets
+E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY="<private key for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_HTTP_URL="<http url 0 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_HTTP_URL_1="<http url 1 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_WS_URL="<ws ws 0 for ethereum network>"
+E2E_TEST_ETHEREUM_MAINNET_RPC_WS_URL_1="<ws ws 1 for ethereum network>"
+
+# Base network secrets
+E2E_TEST_BASE_MAINNET_WALLET_KEY="<private key for base network>"
+E2E_TEST_BASE_MAINNET_RPC_HTTP_URL="<http url 0 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_HTTP_URL_1="<http url 1 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_WS_URL="<ws ws 0 for base network>"
+E2E_TEST_BASE_MAINNET_RPC_WS_URL_1="<ws ws 1 for base network>"
+
+# Other networks secrets (pattern for envs)
+# E2E_TEST_(.+)_WALLET_KEY_(\d+)="<i-th wallet key for (.+) network>"
+# E2E_TEST_(.+)_RPC_HTTP_URL_(\d+)="<i-th http url for (.+) network>"
+# E2E_TEST_(.+)_RPC_WS_URL_(\d+)="<i-th ws url for (.+) network>"
+
+# Loki secrets
+E2E_TEST_LOKI_TENANT_ID="<tenant id for loki>"
+E2E_TEST_LOKI_ENDPOINT="<url for loki>"
+
+# Grafana secrets
+E2E_TEST_GRAFANA_BASE_URL="<url for grafana>"
+E2E_TEST_GRAFANA_DASHBOARD_URL="/d/6vjVx-1V8/ccip-long-running-tests"
diff --git a/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example b/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example
deleted file mode 100644
index 3045f51759..0000000000
--- a/integration-tests/ccip-tests/testconfig/examples/secrets.toml.example
+++ /dev/null
@@ -1,52 +0,0 @@
-# This file contains all secret parameters for ccip tests.
-# DO NOT UPDATE THIS FILE WITH ANY SECRET VALUES.
-# Use this file as a template for the actual secret file and update all the parameter values accordingly.
-# DO NOT COMMIT THE ACTUAL SECRET FILE TO THE REPOSITORY.
-[CCIP]
-[CCIP.Env]
-
-# ChainlinkImage is mandatory for all tests.
-[CCIP.Env.NewCLCluster]
-[CCIP.Env.NewCLCluster.Common]
-[CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-image = "chainlink-ccip"
-version = "latest"
-
-# Chainlink upgrade image is used only for upgrade tests
-#[CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
-#image = "***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
-#version = "****"
-
-
-# Networks configuration with rpc urls and wallet keys are mandatory only for tests running on live networks
-# The following example is for 3 networks: Ethereum, Base and Arbitrum
-# Network configuration can be ignored for tests running on simulated/private networks
-[CCIP.Env.Network]
-selected_networks= [
-    'ETHEREUM_MAINNET','BASE_MAINNET', 'ARBITRUM_MAINNET',
-]
-
-[CCIP.Env.Network.RpcHttpUrls]
-ETHEREUM_MAINNET = ['<https for ethereum network>', '<https for ethereum network>']
-BASE_MAINNET = ['<https for base network>', '<https for base network>']
-ARBITRUM_MAINNET = ['<https for arbitrum network>', '<https for arbitrum network>']
-
-[CCIP.Env.Network.RpcWsUrls]
-ETHEREUM_MAINNET = ['<wss for ethereum network>', '<wss for ethereum network>']
-BASE_MAINNET = ['<wss for base network>', '<wss for base network>']
-ARBITRUM_MAINNET = ['<wss for arbitrum network>', '<wss for arbitrum network>']
-
-[CCIP.Env.Network.WalletKeys]
-ETHEREUM_MAINNET = ['<private key for ethereum network>']
-BASE_MAINNET = ['<private key for base network>']
-ARBITRUM_MAINNET = ['<private key for arbitrum network>']
-
-# Used for tests using 1. loki logging for test results.
-# Mandatory for load tests
-[CCIP.Env.Logging.Loki]
-tenant_id="<tenant id for loki>"
-endpoint="<url for loki>"
-
-[CCIP.Env.Logging.Grafana]
-base_url="<url for grafana>"
-dashboard_url="/d/6vjVx-1V8/ccip-long-running-tests"
diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 331737c5fb..5ed61e63e9 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -29,7 +29,6 @@ import (
 const (
 	OVERIDECONFIG = "BASE64_CCIP_CONFIG_OVERRIDE"
 
-	SECRETSCONFIG             = "BASE64_CCIP_SECRETS_CONFIG"
 	ErrReadConfig             = "failed to read TOML config"
 	ErrUnmarshalConfig        = "failed to unmarshal TOML config"
 	Load               string = "load"
@@ -105,7 +104,7 @@ func EncodeConfigAndSetEnv(c any, envVar string) (string, error) {
 func NewConfig() (*Config, error) {
 	cfg := &Config{}
 	var override *Config
-	var secrets *Config
+	// var secrets *Config
 	// load config from default file
 	err := config.DecodeTOML(bytes.NewReader(DefaultConfig), cfg)
 	if err != nil {
@@ -135,22 +134,10 @@ func NewConfig() (*Config, error) {
 	}
 	// read secrets for all products
 	if cfg.CCIP != nil {
-		// load config from env var if specified for secrets
-		secretRawConfig, _ := osutil.GetEnv(SECRETSCONFIG)
-		if secretRawConfig != "" {
-			err = DecodeConfig(secretRawConfig, &secrets)
-			if err != nil {
-				return nil, fmt.Errorf("failed to decode secrets config: %w", err)
-			}
-			if secrets != nil {
-				// apply secrets for all products
-				if secrets.CCIP != nil {
-					err = cfg.CCIP.ApplyOverrides(secrets.CCIP)
-					if err != nil {
-						return nil, fmt.Errorf("failed to apply secrets: %w", err)
-					}
-				}
-			}
+		ctfconfig.LoadSecretDotEnvFiles()
+		err := cfg.CCIP.LoadFromEnv()
+		if err != nil {
+			return nil, errors.Wrap(err, "error loading env vars into CCIP config")
 		}
 		// validate all products
 		err = cfg.CCIP.Validate()
@@ -176,6 +163,33 @@ type Common struct {
 	Logging                 *ctfconfig.LoggingConfig                    `toml:",omitempty"`
 }
 
+// LoadFromEnv loads selected env vars into the config
+func (c *Common) LoadFromEnv() error {
+	if c.Logging == nil {
+		c.Logging = &ctfconfig.LoggingConfig{}
+	}
+	err := c.Logging.LoadFromEnv()
+	if err != nil {
+		return errors.Wrap(err, "error loading logging config from env")
+	}
+	if c.Network == nil {
+		c.Network = &ctfconfig.NetworkConfig{}
+	}
+	err = c.Network.LoadFromEnv()
+	if err != nil {
+		return errors.Wrap(err, "error loading network config from env")
+	}
+	if c.NewCLCluster == nil {
+		c.NewCLCluster = &ChainlinkDeployment{}
+	}
+	err = c.NewCLCluster.LoadFromEnv()
+	if err != nil {
+		return errors.Wrap(err, "error loading chainlink deployment config from env")
+	}
+
+	return nil
+}
+
 func (p *Common) GetNodeConfig() *ctfconfig.NodeConfig {
 	return &ctfconfig.NodeConfig{
 		BaseConfigTOML:           p.NewCLCluster.Common.BaseConfigTOML,
@@ -340,6 +354,21 @@ type ChainlinkDeployment struct {
 	Nodes          []*Node  `toml:",omitempty"` // to be mentioned only if diff nodes follow diff configs; not required if all nodes follow CommonConfig
 }
 
+func (c *ChainlinkDeployment) LoadFromEnv() error {
+	if c.Common == nil {
+		c.Common = &Node{}
+	}
+	err := c.Common.ChainlinkImage.LoadFromEnv("E2E_TEST_CHAINLINK_IMAGE")
+	if err != nil {
+		return err
+	}
+	err = c.Common.ChainlinkUpgradeImage.LoadFromEnv("E2E_TEST_CHAINLINK_UPGRADE_IMAGE")
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *ChainlinkDeployment) Validate() error {
 	if c.Common == nil {
 		return errors.New("common config can't be empty")
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index bf264296a7..edcb12e0ef 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/ccip/integration-tests
 
-go 1.21.7
+go 1.22.5
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../
@@ -64,6 +64,8 @@ require (
 exclude github.com/hashicorp/consul v1.2.1
 
 replace (
+	github.com/smartcontractkit/chainlink-testing-framework => /Users/lukasz/Documents/smartcontractkit/chainlink-testing-framework
+
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 49fb3fb2fc..f3f3b71e06 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1435,8 +1435,6 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.10 h1:zFsXW04ceKMg37oR0EaxlTPH7vL9YnnNA4VntvsaOZ4=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.10/go.mod h1:wSRZGoukZliwfTkghdF4cI1RLHz5k3aDnL+rXhJ6f7k=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=

From 589f9c2fce0a5459ddd019da7868062475b07a1c Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:02:36 +0200
Subject: [PATCH 02/26] Update integration-tests.yml workflow

---
 .../action.yml                                | 62 +------------------
 .github/workflows/integration-tests.yml       | 44 +++++--------
 .../ccip-tests/testconfig/global.go           | 37 ++++++-----
 3 files changed, 39 insertions(+), 104 deletions(-)

diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml
index 88d9fe8078..1e3b45bf2a 100644
--- a/.github/actions/setup-create-base64-config-ccip/action.yml
+++ b/.github/actions/setup-create-base64-config-ccip/action.yml
@@ -11,30 +11,10 @@ inputs:
     default: "false"
   selectedNetworks:
     description: The networks to run tests against
-  chainlinkImage:
-    description: The chainlink image to use
-    default: "public.ecr.aws/chainlink/chainlink"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
-  upgradeImage:
-    description: The chainlink image to upgrade to
-    default: ""
-  upgradeVersion:
-    description: The git commit sha to use for the image tag
-  lokiEndpoint:
-    description: Loki push endpoint
-  lokiTenantId:
-    description: Loki tenant id
-  lokiBasicAuth:
-    description: Loki basic auth
   logstreamLogTargets:
     description: Where to send logs (e.g. file, loki)
-  grafanaUrl:
-    description: Grafana URL
-  grafanaDashboardUrl:
-    description: Grafana dashboard URL
-  grafanaBearerToken:
-    description: Grafana bearer token
   customEvmNodes:
     description: Custom EVM nodes to use  in key=value format, where key is chain id and value is docker image to use. If they are provided the number of networksSelected must be equal to the number of customEvmNodes
   evmNodeLogLevel:
@@ -52,21 +32,10 @@ runs:
         SELECTED_NETWORKS: ${{ inputs.selectedNetworks }}
         EXISTING_NAMESPACE: ${{ inputs.existingNamespace }}
         TEST_LOG_COLLECT: ${{ inputs.testLogCollect }}
-        CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
-        CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
-        UPGRADE_IMAGE: ${{ inputs.upgradeImage }}
-        UPGRADE_VERSION: ${{ inputs.upgradeVersion }}
-        LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
-        LOKI_TENANT_ID: ${{ inputs.lokiTenantId }}
-        LOKI_BASIC_AUTH: ${{ inputs.lokiBasicAuth }}
         LOGSTREAM_LOG_TARGETS: ${{ inputs.logstreamLogTargets }}
-        GRAFANA_URL: ${{ inputs.grafanaUrl }}
-        GRAFANA_DASHBOARD_URL: ${{ inputs.grafanaDashboardUrl }}
-        GRAFANA_BEARER_TOKEN: ${{ inputs.grafanaBearerToken }}
         CUSTOM_EVM_NODES: ${{ inputs.customEvmNodes }}
         EVM_NODE_LOG_LEVEL: ${{ inputs.evmNodeLogLevel }}
       run: |
-        echo ::add-mask::$CHAINLINK_IMAGE
         function convert_to_toml_array() {
           local IFS=','
           local input_array=($1)
@@ -133,26 +102,12 @@ runs:
           fi
         fi
 
-        grafana_bearer_token=""
-        if [ -n "$GRAFANA_BEARER_TOKEN" ]; then
-          grafana_bearer_token="bearer_token_secret=\"$GRAFANA_BEARER_TOKEN\""
-        fi
-
         cat << EOF > config.toml
         [CCIP]
         [CCIP.Env]
         EnvToConnect="$EXISTING_NAMESPACE"
         [CCIP.Env.Network]
         selected_networks = $selected_networks
-        [CCIP.Env.NewCLCluster]
-        [CCIP.Env.NewCLCluster.Common]
-        [CCIP.Env.NewCLCluster.Common.ChainlinkImage]
-        image="$CHAINLINK_IMAGE"
-        version="$CHAINLINK_VERSION"
-
-        [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
-        image="$UPGRADE_IMAGE"
-        version="$UPGRADE_VERSION"
 
         $custom_nodes_toml
 
@@ -163,16 +118,6 @@ runs:
         [CCIP.Env.Logging.LogStream]
         log_targets=$log_targets
 
-        [CCIP.Env.Logging.Loki]
-        tenant_id="$LOKI_TENANT_ID"
-        endpoint="$LOKI_ENDPOINT"
-        basic_auth_secret="$LOKI_BASIC_AUTH"
-
-        [CCIP.Env.Logging.Grafana]
-        base_url="$GRAFANA_URL"
-        dashboard_url="$GRAFANA_DASHBOARD_URL"
-        $grafana_bearer_token
-
         [CCIP.Groups.load]
         TestRunName = '$EXISTING_NAMESPACE'
 
@@ -181,7 +126,6 @@ runs:
 
         EOF
 
-        BASE64_CCIP_SECRETS_CONFIG=$(cat config.toml | base64 -w 0)
-        echo ::add-mask::$BASE64_CCIP_SECRETS_CONFIG
-        echo "BASE64_CCIP_SECRETS_CONFIG=$BASE64_CCIP_SECRETS_CONFIG" >> $GITHUB_ENV
-        echo "TEST_BASE64_CCIP_SECRETS_CONFIG=$BASE64_CCIP_SECRETS_CONFIG" >> $GITHUB_ENV
+        BASE64_CONFIG=$(cat config.toml | base64 -w 0)
+        echo ::add-mask::$BASE64_CONFIG
+        echo "base64_config=$BASE64_CONFIG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b8bd49fa53..bccacad25b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -548,47 +548,23 @@ jobs:
           gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
           gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-      - name: Prepare Base64 TOML override
-        uses: ./.github/actions/setup-create-base64-config
-        with:
-          runId: ${{ github.run_id }}
-          testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          selectedNetworks: ${{ env.SELECTED_NETWORKS }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ inputs.evm-ref || github.sha }}
-          pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
-          pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}
-          pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
-          logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: "http://localhost:8080/primary" # this is GAP url, it will know where to forward the requests so that they reach the correct Grafana instance
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
-          grafanaBearerToken: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: SIMULATED_1,SIMULATED_2
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: "http://localhost:8080/primary"
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
-          grafanaBearerToken: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
 
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@af92c5fae8dcf1659201e907db82d221fc304b94 # v2.3.21
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           DEBUG_RESTY: false
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage -hidepassingtests=false -hidepassinglogs
@@ -612,6 +588,18 @@ jobs:
           should_tidy: "false"
           go_coverage_src_dir: /var/tmp/go-coverage
           go_coverage_dest_dir: ${{ github.workspace }}/.covdata
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          # DEFAULT_CHAINLINK_UPGRADE_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL_CI }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: "http://localhost:8080/primary"
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+          DEFAULT_GRAFANA_BEARER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
+          DEFAULT_PYROSCOPE_SERVER_URL: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
+          DEFAULT_PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          DEFAULT_PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
+          DEFAULT_PYROSCOPE_ENABLED: ${{ matrix.product.pyroscope_env == '' || !startsWith(github.ref, 'refs/tags/') && 'false' || 'true' }}
 
       - name: Upload Coverage Data
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 5ed61e63e9..9525f8d73d 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -111,23 +111,26 @@ func NewConfig() (*Config, error) {
 		return nil, errors.Wrap(err, ErrReadConfig)
 	}
 
-	// load config from env var if specified
-	rawConfig, _ := osutil.GetEnv(OVERIDECONFIG)
-	if rawConfig != "" {
-		err = DecodeConfig(rawConfig, &override)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decode override config: %w", err)
-		}
-	}
-	if override != nil {
-		// apply overrides for all products
-		if override.CCIP != nil {
-			if cfg.CCIP == nil {
-				cfg.CCIP = override.CCIP
-			} else {
-				err = cfg.CCIP.ApplyOverrides(override.CCIP)
-				if err != nil {
-					return nil, err
+	// load config overrides from env var if specified
+	// there can be multiple overrides separated by comma
+	rawConfigs, _ := osutil.GetEnv(OVERIDECONFIG)
+	if rawConfigs == "" {
+		for _, rawConfig := range strings.Split(rawConfigs, ",") {
+			err = DecodeConfig(rawConfig, &override)
+			if err != nil {
+				return nil, fmt.Errorf("failed to decode override config: %w", err)
+			}
+			if override != nil {
+				// apply overrides for all products
+				if override.CCIP != nil {
+					if cfg.CCIP == nil {
+						cfg.CCIP = override.CCIP
+					} else {
+						err = cfg.CCIP.ApplyOverrides(override.CCIP)
+						if err != nil {
+							return nil, err
+						}
+					}
 				}
 			}
 		}

From c64147b03a30fcd132f3f9aa8509878d511eefaf Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:08:58 +0200
Subject: [PATCH 03/26] Bump CTF

---
 integration-tests/go.mod | 3 +--
 integration-tests/go.sum | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index edcb12e0ef..7e702224ed 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -64,8 +64,7 @@ require (
 exclude github.com/hashicorp/consul v1.2.1
 
 replace (
-	github.com/smartcontractkit/chainlink-testing-framework => /Users/lukasz/Documents/smartcontractkit/chainlink-testing-framework
-
+	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index f3f3b71e06..9a20f4e0f7 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1435,6 +1435,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad h1:emG8Ea6NKnfDUpbv52fuK4kDRrvixcCZ3mI/uRG3ptQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=

From c402b1584e3f834158b808fb60c59bc6474a95d6 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:13:12 +0200
Subject: [PATCH 04/26] Fix load go mod

---
 integration-tests/load/go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index 9ff38e7784..74e3cfa9ff 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/load-tests
 
-go 1.21.7
+go 1.22.5
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../../

From 07b0c38f3c8d4959bada99a7d6b851864e4f4f27 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:28:13 +0200
Subject: [PATCH 05/26] Fix lint

---
 .../ccip-tests/testconfig/global.go           | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 9525f8d73d..1cec74bb68 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -137,8 +137,11 @@ func NewConfig() (*Config, error) {
 	}
 	// read secrets for all products
 	if cfg.CCIP != nil {
-		ctfconfig.LoadSecretDotEnvFiles()
-		err := cfg.CCIP.LoadFromEnv()
+		err := ctfconfig.LoadSecretDotEnvFiles()
+		if err != nil {
+			return nil, errors.Wrap(err, "error loading testsecrets files")
+		}
+		err = cfg.CCIP.LoadFromEnv()
 		if err != nil {
 			return nil, errors.Wrap(err, "error loading env vars into CCIP config")
 		}
@@ -167,25 +170,25 @@ type Common struct {
 }
 
 // LoadFromEnv loads selected env vars into the config
-func (c *Common) LoadFromEnv() error {
-	if c.Logging == nil {
-		c.Logging = &ctfconfig.LoggingConfig{}
+func (p *Common) LoadFromEnv() error {
+	if p.Logging == nil {
+		p.Logging = &ctfconfig.LoggingConfig{}
 	}
-	err := c.Logging.LoadFromEnv()
+	err := p.Logging.LoadFromEnv()
 	if err != nil {
 		return errors.Wrap(err, "error loading logging config from env")
 	}
-	if c.Network == nil {
-		c.Network = &ctfconfig.NetworkConfig{}
+	if p.Network == nil {
+		p.Network = &ctfconfig.NetworkConfig{}
 	}
-	err = c.Network.LoadFromEnv()
+	err = p.Network.LoadFromEnv()
 	if err != nil {
 		return errors.Wrap(err, "error loading network config from env")
 	}
-	if c.NewCLCluster == nil {
-		c.NewCLCluster = &ChainlinkDeployment{}
+	if p.NewCLCluster == nil {
+		p.NewCLCluster = &ChainlinkDeployment{}
 	}
-	err = c.NewCLCluster.LoadFromEnv()
+	err = p.NewCLCluster.LoadFromEnv()
 	if err != nil {
 		return errors.Wrap(err, "error loading chainlink deployment config from env")
 	}

From 701c39ad369e0ac2a2f72a6c3755b9cda3e6a616 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:54:19 +0200
Subject: [PATCH 06/26] Fix nil

---
 integration-tests/ccip-tests/testconfig/global.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 1cec74bb68..a4e6de4389 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -364,10 +364,16 @@ func (c *ChainlinkDeployment) LoadFromEnv() error {
 	if c.Common == nil {
 		c.Common = &Node{}
 	}
+	if c.Common.ChainlinkImage == nil {
+		c.Common.ChainlinkImage = &ctfconfig.ChainlinkImageConfig{}
+	}
 	err := c.Common.ChainlinkImage.LoadFromEnv("E2E_TEST_CHAINLINK_IMAGE")
 	if err != nil {
 		return err
 	}
+	if c.Common.ChainlinkUpgradeImage == nil {
+		c.Common.ChainlinkUpgradeImage = &ctfconfig.ChainlinkImageConfig{}
+	}
 	err = c.Common.ChainlinkUpgradeImage.LoadFromEnv("E2E_TEST_CHAINLINK_UPGRADE_IMAGE")
 	if err != nil {
 		return err

From 2a474879dc115b9eba352117f46746300afa8ce1 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:30:52 +0200
Subject: [PATCH 07/26] Fix loading env vars

---
 .../ccip-tests/testconfig/ccip.go             |   2 +-
 .../ccip-tests/testconfig/global.go           | 181 ++++++++++++++----
 integration-tests/go.mod                      |   3 +-
 integration-tests/go.sum                      |   4 +-
 4 files changed, 147 insertions(+), 43 deletions(-)

diff --git a/integration-tests/ccip-tests/testconfig/ccip.go b/integration-tests/ccip-tests/testconfig/ccip.go
index 499bbe91ca..7d9419828e 100644
--- a/integration-tests/ccip-tests/testconfig/ccip.go
+++ b/integration-tests/ccip-tests/testconfig/ccip.go
@@ -392,7 +392,7 @@ func (c *CCIP) LoadFromEnv() error {
 	if c.Env == nil {
 		c.Env = &Common{}
 	}
-	err := c.Env.LoadFromEnv()
+	err := c.Env.ReadFromEnvVar()
 	if err != nil {
 		return err
 	}
diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index a4e6de4389..1a002362ee 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -15,6 +15,7 @@ import (
 	"github.com/smartcontractkit/seth"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
+	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
@@ -137,7 +138,7 @@ func NewConfig() (*Config, error) {
 	}
 	// read secrets for all products
 	if cfg.CCIP != nil {
-		err := ctfconfig.LoadSecretDotEnvFiles()
+		err := ctfconfig.LoadSecretEnvsFromFiles()
 		if err != nil {
 			return nil, errors.Wrap(err, "error loading testsecrets files")
 		}
@@ -169,28 +170,151 @@ type Common struct {
 	Logging                 *ctfconfig.LoggingConfig                    `toml:",omitempty"`
 }
 
-// LoadFromEnv loads selected env vars into the config
-func (p *Common) LoadFromEnv() error {
-	if p.Logging == nil {
-		p.Logging = &ctfconfig.LoggingConfig{}
+// ReadFromEnvVar loads selected env vars into the config
+func (p *Common) ReadFromEnvVar() error {
+	logger := logging.GetTestLogger(nil)
+
+	lokiTenantID := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_TENANT_ID_ENV)
+	if lokiTenantID != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.TenantId", ctfconfig.E2E_TEST_LOKI_TENANT_ID_ENV)
+		p.Logging.Loki.TenantId = &lokiTenantID
 	}
-	err := p.Logging.LoadFromEnv()
-	if err != nil {
-		return errors.Wrap(err, "error loading logging config from env")
+
+	lokiEndpoint := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_ENDPOINT_ENV)
+	if lokiEndpoint != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.Endpoint", ctfconfig.E2E_TEST_LOKI_ENDPOINT_ENV)
+		p.Logging.Loki.Endpoint = &lokiEndpoint
 	}
-	if p.Network == nil {
-		p.Network = &ctfconfig.NetworkConfig{}
+
+	lokiBasicAuth := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_BASIC_AUTH_ENV)
+	if lokiBasicAuth != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.BasicAuth", ctfconfig.E2E_TEST_LOKI_BASIC_AUTH_ENV)
+		p.Logging.Loki.BasicAuth = &lokiBasicAuth
 	}
-	err = p.Network.LoadFromEnv()
-	if err != nil {
-		return errors.Wrap(err, "error loading network config from env")
+
+	lokiBearerToken := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_LOKI_BEARER_TOKEN_ENV)
+	if lokiBearerToken != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Loki == nil {
+			p.Logging.Loki = &ctfconfig.LokiConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Loki.BearerToken", ctfconfig.E2E_TEST_LOKI_BEARER_TOKEN_ENV)
+		p.Logging.Loki.BearerToken = &lokiBearerToken
 	}
-	if p.NewCLCluster == nil {
-		p.NewCLCluster = &ChainlinkDeployment{}
+
+	grafanaBaseUrl := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_BASE_URL_ENV)
+	if grafanaBaseUrl != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.BaseUrl", ctfconfig.E2E_TEST_GRAFANA_BASE_URL_ENV)
+		p.Logging.Grafana.BaseUrl = &grafanaBaseUrl
 	}
-	err = p.NewCLCluster.LoadFromEnv()
-	if err != nil {
-		return errors.Wrap(err, "error loading chainlink deployment config from env")
+
+	grafanaDashboardUrl := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_DASHBOARD_URL_ENV)
+	if grafanaDashboardUrl != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.DashboardUrl", ctfconfig.E2E_TEST_GRAFANA_DASHBOARD_URL_ENV)
+		p.Logging.Grafana.DashboardUrl = &grafanaDashboardUrl
+	}
+
+	grafanaBearerToken := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_GRAFANA_BEARER_TOKEN_ENV)
+	if grafanaBearerToken != "" {
+		if p.Logging == nil {
+			p.Logging = &ctfconfig.LoggingConfig{}
+		}
+		if p.Logging.Grafana == nil {
+			p.Logging.Grafana = &ctfconfig.GrafanaConfig{}
+		}
+		logger.Debug().Msgf("Using %s env var to override Logging.Grafana.BearerToken", ctfconfig.E2E_TEST_GRAFANA_BEARER_TOKEN_ENV)
+		p.Logging.Grafana.BearerToken = &grafanaBearerToken
+	}
+
+	walletKeys := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_WALLET_KEY_ENV, ctfconfig.E2E_TEST_WALLET_KEYS_ENV)
+	if len(walletKeys) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.WalletKeys", ctfconfig.E2E_TEST_WALLET_KEY_ENV, ctfconfig.E2E_TEST_WALLET_KEYS_ENV)
+		p.Network.WalletKeys = walletKeys
+	}
+
+	rpcHttpUrls := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_RPC_HTTP_URL_ENV, ctfconfig.E2E_TEST_RPC_HTTP_URLS_ENV)
+	if len(rpcHttpUrls) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.RpcHttpUrls", ctfconfig.E2E_TEST_RPC_HTTP_URL_ENV, ctfconfig.E2E_TEST_RPC_HTTP_URLS_ENV)
+		p.Network.RpcHttpUrls = rpcHttpUrls
+	}
+
+	rpcWsUrls := ctfconfig.ReadEnvVarGroupedMap(ctfconfig.E2E_TEST_RPC_WS_URL_ENV, ctfconfig.E2E_TEST_RPC_WS_URLS_ENV)
+	if len(rpcWsUrls) > 0 {
+		if p.Network == nil {
+			p.Network = &ctfconfig.NetworkConfig{}
+		}
+		logger.Debug().Msgf("Using %s and/or %s env vars to override Network.RpcWsUrls", ctfconfig.E2E_TEST_RPC_WS_URL_ENV, ctfconfig.E2E_TEST_RPC_WS_URLS_ENV)
+		p.Network.RpcWsUrls = rpcWsUrls
+	}
+
+	chainlinkImage := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_CHAINLINK_IMAGE_ENV)
+	if chainlinkImage != "" {
+		if p.NewCLCluster == nil {
+			p.NewCLCluster = &ChainlinkDeployment{}
+		}
+		if p.NewCLCluster.Common == nil {
+			p.NewCLCluster.Common = &Node{}
+		}
+		if p.NewCLCluster.Common.ChainlinkImage == nil {
+			p.NewCLCluster.Common.ChainlinkImage = &ctfconfig.ChainlinkImageConfig{}
+		}
+
+		logger.Debug().Msgf("Using %s env var to override NewCLCluster.Common.ChainlinkImage.Image", ctfconfig.E2E_TEST_CHAINLINK_IMAGE_ENV)
+		p.NewCLCluster.Common.ChainlinkImage.Image = &chainlinkImage
+	}
+
+	chainlinkUpgradeImage := ctfconfig.MustReadEnvVar_String(ctfconfig.E2E_TEST_CHAINLINK_UPGRADE_IMAGE_ENV)
+	if chainlinkUpgradeImage != "" {
+		if p.NewCLCluster == nil {
+			p.NewCLCluster = &ChainlinkDeployment{}
+		}
+		if p.NewCLCluster.Common == nil {
+			p.NewCLCluster.Common = &Node{}
+		}
+		if p.NewCLCluster.Common.ChainlinkUpgradeImage == nil {
+			p.NewCLCluster.Common.ChainlinkUpgradeImage = &ctfconfig.ChainlinkImageConfig{}
+		}
+
+		logger.Debug().Msgf("Using %s env var to override NewCLCluster.Common.ChainlinkUpgradeImage.Image", ctfconfig.E2E_TEST_CHAINLINK_UPGRADE_IMAGE_ENV)
+		p.NewCLCluster.Common.ChainlinkUpgradeImage.Image = &chainlinkUpgradeImage
 	}
 
 	return nil
@@ -360,27 +484,6 @@ type ChainlinkDeployment struct {
 	Nodes          []*Node  `toml:",omitempty"` // to be mentioned only if diff nodes follow diff configs; not required if all nodes follow CommonConfig
 }
 
-func (c *ChainlinkDeployment) LoadFromEnv() error {
-	if c.Common == nil {
-		c.Common = &Node{}
-	}
-	if c.Common.ChainlinkImage == nil {
-		c.Common.ChainlinkImage = &ctfconfig.ChainlinkImageConfig{}
-	}
-	err := c.Common.ChainlinkImage.LoadFromEnv("E2E_TEST_CHAINLINK_IMAGE")
-	if err != nil {
-		return err
-	}
-	if c.Common.ChainlinkUpgradeImage == nil {
-		c.Common.ChainlinkUpgradeImage = &ctfconfig.ChainlinkImageConfig{}
-	}
-	err = c.Common.ChainlinkUpgradeImage.LoadFromEnv("E2E_TEST_CHAINLINK_UPGRADE_IMAGE")
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (c *ChainlinkDeployment) Validate() error {
 	if c.Common == nil {
 		return errors.New("common config can't be empty")
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 7e702224ed..0f6dc91865 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -64,7 +64,8 @@ require (
 exclude github.com/hashicorp/consul v1.2.1
 
 replace (
-	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad
+	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4
+
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 9a20f4e0f7..75160ff512 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1435,8 +1435,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad h1:emG8Ea6NKnfDUpbv52fuK4kDRrvixcCZ3mI/uRG3ptQ=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712120531-caf8ae6267ad/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4 h1:fTqVXHYSS3OK5nJEzBNKHMcyM9qebtm8ggfct8moeY0=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=

From c07781c21c30c394146cc5c111906062a249058a Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:42:44 +0200
Subject: [PATCH 08/26] Bump

---
 integration-tests/go.mod | 2 +-
 integration-tests/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 0f6dc91865..de40e54208 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -64,7 +64,7 @@ require (
 exclude github.com/hashicorp/consul v1.2.1
 
 replace (
-	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4
+	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e
 
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 75160ff512..8cde119864 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1435,8 +1435,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4 h1:fTqVXHYSS3OK5nJEzBNKHMcyM9qebtm8ggfct8moeY0=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712142233-00b78cd832b4/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e h1:EgX3RlJh+iijHCL7x+vohuonSYgRbFMCVNw8Mk7V9yQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=

From 22360e01f5d0021c172cef0081660efce74c37cc Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Fri, 12 Jul 2024 17:04:54 +0200
Subject: [PATCH 09/26] Fix gha

---
 .../action.yml                                | 22 ++++++++++++++++++-
 .github/workflows/integration-tests.yml       |  1 -
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml
index 1e3b45bf2a..1916586451 100644
--- a/.github/actions/setup-create-base64-config-ccip/action.yml
+++ b/.github/actions/setup-create-base64-config-ccip/action.yml
@@ -13,6 +13,8 @@ inputs:
     description: The networks to run tests against
   chainlinkVersion:
     description: The git commit sha to use for the image tag
+  upgradeVersion:
+    description: The git commit sha to use for the image tag    
   logstreamLogTargets:
     description: Where to send logs (e.g. file, loki)
   customEvmNodes:
@@ -20,18 +22,24 @@ inputs:
   evmNodeLogLevel:
     description: Log level for the custom EVM nodes
     default: "info"
+outputs:
+  base64_config:
+    description: The base64-encoded config
+    value: ${{ steps.base64_config_override.outputs.base64_config }}
 
 runs:
   using: composite
   steps:
     - name: Prepare Base64 TOML override
       shell: bash
-      id: base64-config-override
+      id: base64_config_override
       env:
         RUN_ID: ${{ inputs.runId }}
         SELECTED_NETWORKS: ${{ inputs.selectedNetworks }}
         EXISTING_NAMESPACE: ${{ inputs.existingNamespace }}
         TEST_LOG_COLLECT: ${{ inputs.testLogCollect }}
+        CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+        UPGRADE_VERSION: ${{ inputs.upgradeVersion }}
         LOGSTREAM_LOG_TARGETS: ${{ inputs.logstreamLogTargets }}
         CUSTOM_EVM_NODES: ${{ inputs.customEvmNodes }}
         EVM_NODE_LOG_LEVEL: ${{ inputs.evmNodeLogLevel }}
@@ -108,6 +116,10 @@ runs:
         EnvToConnect="$EXISTING_NAMESPACE"
         [CCIP.Env.Network]
         selected_networks = $selected_networks
+        [CCIP.Env.NewCLCluster]
+        [CCIP.Env.NewCLCluster.Common]
+        [CCIP.Env.NewCLCluster.Common.ChainlinkImage]
+        version="$CHAINLINK_VERSION"
 
         $custom_nodes_toml
 
@@ -126,6 +138,14 @@ runs:
 
         EOF
 
+        # Check if UPGRADE_VERSION is not empty and append to config.toml
+        if [ -n "$UPGRADE_VERSION" ]; then
+          cat << EOF >> config.toml
+        [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
+        version="$UPGRADE_VERSION"
+        EOF
+        fi        
+
         BASE64_CONFIG=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG
         echo "base64_config=$BASE64_CONFIG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index bccacad25b..a319e81291 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -272,7 +272,6 @@ jobs:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: ${{ env.SELECTED_NETWORKS }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ inputs.evm-ref || github.sha }}
           pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}

From f879a1a0a277dff910b8bb58765d5fca6bc0aa1d Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:03:12 +0200
Subject: [PATCH 10/26] Show base64 config override in logs

---
 .github/actions/setup-create-base64-config-ccip/action.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml
index 1916586451..0b232a631d 100644
--- a/.github/actions/setup-create-base64-config-ccip/action.yml
+++ b/.github/actions/setup-create-base64-config-ccip/action.yml
@@ -144,7 +144,10 @@ runs:
         [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage]
         version="$UPGRADE_VERSION"
         EOF
-        fi        
+        fi     
+
+        echo "Generated config.toml:"
+        cat config.toml   
 
         BASE64_CONFIG=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG

From 7a660f74c4436facc7482aeb7dba59b3ccd1fb4d Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:03:18 +0200
Subject: [PATCH 11/26] Fix

---
 .github/actions/setup-create-base64-config-ccip/action.yml | 3 ---
 .github/workflows/integration-tests.yml                    | 2 +-
 integration-tests/ccip-tests/testconfig/global.go          | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml
index 0b232a631d..e741a2dac0 100644
--- a/.github/actions/setup-create-base64-config-ccip/action.yml
+++ b/.github/actions/setup-create-base64-config-ccip/action.yml
@@ -146,9 +146,6 @@ runs:
         EOF
         fi     
 
-        echo "Generated config.toml:"
-        cat config.toml   
-
         BASE64_CONFIG=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG
         echo "base64_config=$BASE64_CONFIG" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index a319e81291..f92dc1eb9e 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -554,7 +554,7 @@ jobs:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: SIMULATED_1,SIMULATED_2
-          chainlinkVersion: ${{ github.sha }}
+          chainlinkVersion: ${{ inputs.evm-ref || github.sha }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
 
       ## Run this step when changes that require tests to be run are made
diff --git a/integration-tests/ccip-tests/testconfig/global.go b/integration-tests/ccip-tests/testconfig/global.go
index 1a002362ee..a1658a4841 100644
--- a/integration-tests/ccip-tests/testconfig/global.go
+++ b/integration-tests/ccip-tests/testconfig/global.go
@@ -115,7 +115,7 @@ func NewConfig() (*Config, error) {
 	// load config overrides from env var if specified
 	// there can be multiple overrides separated by comma
 	rawConfigs, _ := osutil.GetEnv(OVERIDECONFIG)
-	if rawConfigs == "" {
+	if rawConfigs != "" {
 		for _, rawConfig := range strings.Split(rawConfigs, ",") {
 			err = DecodeConfig(rawConfig, &override)
 			if err != nil {

From e630d269a82675d3fed6fd90460fa080a144adc2 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 09:59:53 +0200
Subject: [PATCH 12/26] Update ccip-chaos-tests.yml

---
 .github/workflows/ccip-chaos-tests.yml | 39 +++++++++++++++-----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
index 6d1aaffb17..6442c07c13 100644
--- a/.github/workflows/ccip-chaos-tests.yml
+++ b/.github/workflows/ccip-chaos-tests.yml
@@ -123,23 +123,20 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Run Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 1h -count=1 -json -test.parallel 11 -run 'TestChaosCCIP' ./chaos 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: make gomod
-          cl_repo: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-          cl_image_tag: ${{ github.sha }}
           artifacts_location: ./integration-tests/chaos/logs
           publish_check_name: CCIP Chaos Test Results
           publish_report_paths: ./tests-chaos-report.xml
@@ -153,6 +150,13 @@ jobs:
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+
       ## Notify in slack if the job fails
       - name: Notify Slack
         if: failure() && github.event_name != 'workflow_dispatch'
@@ -205,23 +209,20 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Prepare Base64 TOML override for CCIP secrests
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Load With Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -timeout 2h -count=1 -json -test.parallel 4 -run '^TestLoadCCIPStableWithPodChaosDiffCommitAndExec' ./load 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: make gomod
-          cl_repo: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-          cl_image_tag: ${{ github.sha }}
           artifacts_location: ./integration-tests/load/logs
           publish_check_name: CCIP Chaos With Load Test Results
           publish_report_paths: ./tests-chaos-with-load-report.xml
@@ -235,6 +236,12 @@ jobs:
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
       ## Notify in slack if the job fails
       - name: Notify Slack
         if: failure() && github.event_name != 'workflow_dispatch'

From 53e17cafea8cd6fc7f48d8dbed04a12303d7dee0 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:10:47 +0200
Subject: [PATCH 13/26] Update ccip-client-compatibility-tests.yml

---
 .../ccip-client-compatibility-tests.yml       | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ccip-client-compatibility-tests.yml b/.github/workflows/ccip-client-compatibility-tests.yml
index c1090d4ddb..2b3b3e9c8a 100644
--- a/.github/workflows/ccip-client-compatibility-tests.yml
+++ b/.github/workflows/ccip-client-compatibility-tests.yml
@@ -492,33 +492,17 @@ jobs:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: ${{ matrix.evm_node.networks }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ needs.select-versions.outputs.chainlink_version }}
-          pyroscopeServer: ${{ !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
-          pyroscopeEnvironment: ci-ccip-bidirectional-lane-${{ matrix.evm_node.name }}
-          pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
         with:
           runId: ${{ github.run_id }}
-          testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           selectedNetworks: ${{ matrix.evm_node.networks }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
+          testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
           chainlinkVersion: ${{ needs.select-versions.outputs.chainlink_version }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
           customEvmNodes: ${{ matrix.evm_node.docker_image }}
-          evmNodeLogLevel: "trace"
       - name: Prepare test log name
         run: |
           replace_special_chars() {
@@ -547,7 +531,10 @@ jobs:
           echo "EVM Implementation Networks: ${{ matrix.evm_node.networks }}"
           echo "Test identifier: ${{ matrix.evm_node.name }}"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        env:
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=2 ${{ matrix.evm_node.run }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -568,6 +555,17 @@ jobs:
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ""
           should_tidy: "false"
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL_CI }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+          DEFAULT_PYROSCOPE_SERVER_URL: ${{ !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
+          DEFAULT_PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          DEFAULT_PYROSCOPE_ENVIRONMENT: ci-ccip-bidirectional-lane-${{ matrix.evm_node.name }}
+          DEFAULT_PYROSCOPE_ENABLED: 'true'
+
       - name: Print failed test summary
         if: always()
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@1587f59bfd626b668d303abbc90fee41b12397e6 # v2.3.23

From e5bbfd2978a0102ded9c7a7339554170bc3e53b5 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:24:09 +0200
Subject: [PATCH 14/26] Update ccip-live-network-tests.yml

---
 .../ccip-client-compatibility-tests.yml       |  3 +-
 .github/workflows/ccip-live-network-tests.yml | 61 ++++++++++---------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ccip-client-compatibility-tests.yml b/.github/workflows/ccip-client-compatibility-tests.yml
index 2b3b3e9c8a..16dcaf8529 100644
--- a/.github/workflows/ccip-client-compatibility-tests.yml
+++ b/.github/workflows/ccip-client-compatibility-tests.yml
@@ -496,6 +496,7 @@ jobs:
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           selectedNetworks: ${{ matrix.evm_node.networks }}
@@ -538,8 +539,6 @@ jobs:
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=2 ${{ matrix.evm_node.run }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ needs.select-versions.outputs.chainlink_version }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           artifacts_name:  ${{ env.TEST_LOG_NAME }}
           artifacts_location: |
diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index 94aa36ddf8..540ab583e5 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -25,8 +25,8 @@ concurrency:
 
 env:
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
-  CHAINLINK_VERSION: ${{ github.sha}}
-  CHAINLINK_TEST_VERSION: ${{ github.sha}}
+  CHAINLINK_VERSION: ${{ github.sha }}
+  CHAINLINK_TEST_VERSION: ${{ github.sha }}
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests:${{ github.sha }}
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   AWS_ECR_REPO_PUBLIC_REGISTRY: public.ecr.aws
@@ -142,6 +142,7 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Prepare Base64 TOML override
+        id: set_override_config
         shell: bash
         run: |
           SLACK_USER=$(jq -r '.inputs.slackMemberID' $GITHUB_EVENT_PATH)
@@ -150,14 +151,12 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ./integration-tests/ccip-tests/testconfig/override/${{ matrix.config }})
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
             echo "SLACK_USER=${{ secrets.QA_SLACK_USER }}" >> $GITHUB_ENV
           fi
       - name: step summary
@@ -169,19 +168,14 @@ jobs:
           echo "\`${{ env.CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
+          chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
         env:
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 900h
@@ -190,11 +184,11 @@ jobs:
           RR_CPU: 4
           DETACH_RUNNER: true
           TEST_TRIGGERED_BY: ccip-load-test-ci
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}          
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -json -run ^TestLoadCCIPStableRPS$ ./load 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -206,7 +200,13 @@ jobs:
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
           should_cleanup: false
-
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
+          
   ccip-smoke-test:
     name: CCIP smoke Test
     environment: integration
@@ -245,6 +245,7 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Prepare Base64 TOML override
+        id: set_override_config
         shell: bash
         run: |
           SLACK_USER=$(jq -r '.inputs.slackMemberID' $GITHUB_EVENT_PATH)
@@ -253,8 +254,7 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
       - name: step summary
         shell: bash
@@ -265,19 +265,14 @@ jobs:
           echo "\`${{ env.CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
-          chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
+          chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
         env:
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 900h
@@ -286,11 +281,11 @@ jobs:
           RR_MEM: 8Gi
           RR_CPU: 4
           TEST_TRIGGERED_BY: ccip-smoke-test-ci
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}                    
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -p 30 -json -run ^TestSmokeCCIPForBidirectionalLane$ ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -301,4 +296,10 @@ jobs:
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           cache_key_id: ccip-smoke-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
-          should_cleanup: false
\ No newline at end of file
+          should_cleanup: false
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
\ No newline at end of file

From 62711788487c8de316617170df0185550823f959 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:41:50 +0200
Subject: [PATCH 15/26] Update ccip-offchain-upgrade-tests.yml and bump GHA

---
 .github/workflows/ccip-chaos-tests.yml        |  4 +-
 .../ccip-client-compatibility-tests.yml       |  2 +-
 .github/workflows/ccip-live-network-tests.yml |  4 +-
 .../workflows/ccip-offchain-upgrade-tests.yml | 45 ++++++++++---------
 .github/workflows/integration-tests.yml       |  2 +-
 5 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
index 6442c07c13..da868886f1 100644
--- a/.github/workflows/ccip-chaos-tests.yml
+++ b/.github/workflows/ccip-chaos-tests.yml
@@ -130,7 +130,7 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
       - name: Run Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
@@ -216,7 +216,7 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
       - name: Run Load With Chaos Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
diff --git a/.github/workflows/ccip-client-compatibility-tests.yml b/.github/workflows/ccip-client-compatibility-tests.yml
index 16dcaf8529..9d3792f365 100644
--- a/.github/workflows/ccip-client-compatibility-tests.yml
+++ b/.github/workflows/ccip-client-compatibility-tests.yml
@@ -532,7 +532,7 @@ jobs:
           echo "EVM Implementation Networks: ${{ matrix.evm_node.networks }}"
           echo "Test identifier: ${{ matrix.evm_node.name }}"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index 540ab583e5..abf40af64d 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -175,7 +175,7 @@ jobs:
           chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 900h
@@ -272,7 +272,7 @@ jobs:
           chainlinkVersion: ${{ env.CHAINLINK_VERSION }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 900h
diff --git a/.github/workflows/ccip-offchain-upgrade-tests.yml b/.github/workflows/ccip-offchain-upgrade-tests.yml
index 50e02dfc55..147f727425 100644
--- a/.github/workflows/ccip-offchain-upgrade-tests.yml
+++ b/.github/workflows/ccip-offchain-upgrade-tests.yml
@@ -221,24 +221,19 @@ jobs:
           fi
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          selectedNetworks: SIMULATED_1,SIMULATED_2
-          chainlinkImage: ${{ env.AWS_ECR_REPO_PUBLIC_REGISTRY }}/w0i8p0z9/chainlink-ccip
           chainlinkVersion: ${{ env.RELEASE_TAG }}
-          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+          selectedNetworks: SIMULATED_1,SIMULATED_2
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ github.sha }}
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 30m
@@ -266,6 +261,12 @@ jobs:
           triggered_by: ${{ env.TEST_TRIGGERED_BY }}
           should_tidy: "false"
           should_cleanup: "false"
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.AWS_ECR_REPO_PUBLIC_REGISTRY }}/w0i8p0z9/chainlink-ccip
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL_CI }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
 
       - name: store laneconfig in artifacts
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
@@ -342,25 +343,20 @@ jobs:
           fi
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
-          existingNamespace: ${{ needs.run-test-with-last-release.outputs.existing_namespace }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          upgradeImage: ${{ env.CHAINLINK_IMAGE }}
           upgradeVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
+          existingNamespace: ${{ needs.run-test-with-last-release.outputs.existing_namespace }}
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
-          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ github.sha }}
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 1h
@@ -387,4 +383,11 @@ jobs:
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
           should_tidy: "false"
           should_cleanup: "true"
-          triggered_by: ${{ needs.run-test-with-last-release.outputs.triggered_by }}
\ No newline at end of file
+          triggered_by: ${{ needs.run-test-with-last-release.outputs.triggered_by }}
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_CHAINLINK_UPGRADE_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
\ No newline at end of file
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index f92dc1eb9e..e35eac97c4 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -560,7 +560,7 @@ jobs:
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
           TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}

From ee0a7660746bd33f78bce285f4659b73976148a9 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:15:44 +0200
Subject: [PATCH 16/26] Add test_secrets_override_key to workflows

---
 .github/workflows/ccip-live-network-tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index abf40af64d..916fe15f94 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -17,6 +17,10 @@ on:
         options:
           - 'load'
           - 'smoke'
+      test_secrets_override_key:
+        description: 'Key to run tests with custom test secrets. Find more at: https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#run-github-workflow-with-your-test-secrets'
+        required: false
+        type: string           
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -189,6 +193,7 @@ jobs:
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -json -run ^TestLoadCCIPStableRPS$ ./load 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}

From c65ac4bd6b7b7db5f36c2e82601ff2b2d7198d8a Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:25:44 +0200
Subject: [PATCH 17/26] Update ccip-load-tests.yml

---
 .github/workflows/ccip-live-network-tests.yml |  4 +--
 .github/workflows/ccip-load-tests.yml         | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
index 916fe15f94..fb2c8ea39d 100644
--- a/.github/workflows/ccip-live-network-tests.yml
+++ b/.github/workflows/ccip-live-network-tests.yml
@@ -18,9 +18,9 @@ on:
           - 'load'
           - 'smoke'
       test_secrets_override_key:
-        description: 'Key to run tests with custom test secrets. Find more at: https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md#run-github-workflow-with-your-test-secrets'
+        description: 'Key to run tests with custom test secrets'
         required: false
-        type: string           
+        type: string
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 9f6a2b0878..5b2c2f4ddc 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -10,6 +10,10 @@ on:
       base64_test_input: # base64 encoded toml for test input
         description: 'Base64 encoded toml test input'
         required: false
+      test_secrets_override_key:
+        description: 'Key to run tests with custom test secrets'
+        required: false
+        type: string        
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -143,20 +147,19 @@ jobs:
         with:
           ref: ${{ env.REF_NAME }}
       - name: Sets env vars
+        id: set_override_config
         shell: bash
         run: |
           # if the matrix.type.config_path is set, use it as the override config
           if [ -n "${{ matrix.type.config_path }}" ]; then
-              echo "BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})" >> $GITHUB_ENV
-              echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})" >> $GITHUB_ENV
+              BASE64_CCIP_CONFIG_OVERRIDE=$(base64 -w 0 -i ${{ matrix.type.config_path }})
+              echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
+              echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             BASE64_CCIP_CONFIG_OVERRIDE=$(jq -r '.inputs.base64_test_input' $GITHUB_EVENT_PATH)
             echo ::add-mask::$BASE64_CCIP_CONFIG_OVERRIDE
-            if [ -n "${BASE64_CCIP_CONFIG_OVERRIDE}" &&  "$BASE64_CCIP_CONFIG_OVERRIDE" != "null"]; then
-              echo "BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-              echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_ENV
-            fi
+            echo "base_64_override=$BASE64_CCIP_CONFIG_OVERRIDE" >> $GITHUB_OUTPUT
           fi
       - name: step summary
         shell: bash
@@ -167,18 +170,14 @@ jobs:
           echo "\`${{ env.INPUT_CHAINLINK_TEST_VERSION }}\`" >> $GITHUB_STEP_SUMMARY
       - name: Prepare Base64 TOML override for CCIP secrets
         uses: ./.github/actions/setup-create-base64-config-ccip
+        id: setup_create_base64_config_ccip
         with:
           runId: ${{ github.run_id }}
           testLogCollect: ${{ vars.TEST_LOG_COLLECT }}
-          chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
-          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
-          grafanaUrl: ${{ vars.GRAFANA_URL }}
-          grafanaDashboardUrl: "/d/6vjVx-1V8/ccip-long-running-tests"
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@d38226be720c5ccc1ff4d3cee40608ebf264cd59 # v2.3.26
         env:
           TEST_SUITE: load
           TEST_ARGS: -test.timeout 900h
@@ -186,11 +185,12 @@ jobs:
           RR_MEM: 8Gi
           RR_CPU: 4
           TEST_TRIGGERED_BY: ccip-load-test-ci-${{ matrix.type.name }}
+          BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}
+          TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }},${{ steps.setup_create_base64_config_ccip.outputs.base64_config }}          
         with:
           test_command_to_run: cd ./integration-tests/ccip-tests && go test -v -timeout 70m -count=1 -json -run ${{ matrix.type.run }} ./load 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
@@ -203,6 +203,12 @@ jobs:
           cache_key_id: ccip-load-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
           should_cleanup: "true"
+          DEFAULT_CHAINLINK_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          DEFAULT_LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          DEFAULT_LOKI_ENDPOINT: ${{ secrets.LOKI_URL }}
+          DEFAULT_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          DEFAULT_GRAFANA_BASE_URL: ${{ vars.GRAFANA_URL }}
+          DEFAULT_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
 
   # Reporting Jobs
   start-slack-thread:

From de2462628e2f4ef9407d601c56dc3f9d17c0aec8 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:40:11 +0200
Subject: [PATCH 18/26] Bump CTF

---
 integration-tests/go.mod      | 4 +---
 integration-tests/go.sum      | 4 ++--
 integration-tests/load/go.mod | 2 +-
 integration-tests/load/go.sum | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index de40e54208..12d5f53d75 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.18
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240708180634-24440372521a
-	github.com/smartcontractkit/chainlink-testing-framework v1.31.10
+	github.com/smartcontractkit/chainlink-testing-framework v1.32.3
 	github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000
@@ -64,8 +64,6 @@ require (
 exclude github.com/hashicorp/consul v1.2.1
 
 replace (
-	github.com/smartcontractkit/chainlink-testing-framework => github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e
-
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 8cde119864..7ac9b230c2 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1435,8 +1435,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e h1:EgX3RlJh+iijHCL7x+vohuonSYgRbFMCVNw8Mk7V9yQ=
-github.com/smartcontractkit/chainlink-testing-framework v1.32.3-0.20240712144111-7011315ea08e/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3 h1:Uv3slT6O/gCyt5eHqWVomnZJDfgTqqpNQCYBs+lUBBs=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index 74e3cfa9ff..fb1cde4a7c 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.4
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240708180634-24440372521a
-	github.com/smartcontractkit/chainlink-testing-framework v1.31.10
+	github.com/smartcontractkit/chainlink-testing-framework v1.32.3
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c
 	github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8
 	github.com/smartcontractkit/libocr v0.0.0-20240702141926-063ceef8c42e
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index fabfd7c7ee..224a3b8fab 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -1425,8 +1425,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240701154249-032706dcb7c8/go.mod h1:NbXXQaNFskVMYRut0MvBlcHu/vDgipGMwYjamvjVB9Y=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.10 h1:zFsXW04ceKMg37oR0EaxlTPH7vL9YnnNA4VntvsaOZ4=
-github.com/smartcontractkit/chainlink-testing-framework v1.31.10/go.mod h1:wSRZGoukZliwfTkghdF4cI1RLHz5k3aDnL+rXhJ6f7k=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3 h1:Uv3slT6O/gCyt5eHqWVomnZJDfgTqqpNQCYBs+lUBBs=
+github.com/smartcontractkit/chainlink-testing-framework v1.32.3/go.mod h1:OYlILtWsQskqZgzIjRe7PpIEySJVhb4qMnGxOuzrUgA=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=

From 8800bce05488278c4891ebe7bf1d4d4db8bc06ae Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Tue, 6 Aug 2024 14:56:02 -0400
Subject: [PATCH 19/26] Typos

---
 integration-tests/ccip-tests/Makefile                           | 2 ++
 .../ccip-tests/testconfig/examples/.testsecrets.example         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/integration-tests/ccip-tests/Makefile b/integration-tests/ccip-tests/Makefile
index 53a4cfc756..d33d956915 100644
--- a/integration-tests/ccip-tests/Makefile
+++ b/integration-tests/ccip-tests/Makefile
@@ -6,6 +6,8 @@ set_config:
   			echo "Overriding config with $(override_toml)"; \
 			echo "export BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" > ./testconfig/override/.env; \
         	echo "export TEST_BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" >> ./testconfig/override/.env; \
+			echo "BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" > ./testconfig/override/debug.env; \
+			echo "TEST_BASE64_CCIP_CONFIG_OVERRIDE=$$(base64 -i $(override_toml))" >> ./testconfig/override/debug.env; \
     else \
       		echo "No override config found, using default config"; \
         	echo  > ./testconfig/override/.env; \
diff --git a/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
index 567a15b054..e69ef9e854 100644
--- a/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
+++ b/integration-tests/ccip-tests/testconfig/examples/.testsecrets.example
@@ -9,7 +9,7 @@
 E2E_TEST_CHAINLINK_IMAGE="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
 
 # Chainlink upgrade image for NewCLCluster. Used only for upgrade tests
-E2E_TEST_CHAINLINK_UPGRADE_IMAG="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
+E2E_TEST_CHAINLINK_UPGRADE_IMAGE="***.dkr.ecr.***.amazonaws.com/chainlink-ccip"
 
 # Ethereum network secrets
 E2E_TEST_ETHEREUM_MAINNET_WALLET_KEY="<private key for ethereum network>"

From 4a27c4d9aa11534ab4c7b13ee4a364afc03d8069 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Tue, 6 Aug 2024 15:24:59 -0400
Subject: [PATCH 20/26] Debugging CI load test

---
 .github/workflows/ccip-load-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 5b2c2f4ddc..62d2a798d3 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -14,6 +14,7 @@ on:
         description: 'Key to run tests with custom test secrets'
         required: false
         type: string        
+  pull_request: # DEBUG: Checking run conditions
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -21,7 +22,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip
   CHAINLINK_VERSION: ${{ github.sha}}
   INPUT_CHAINLINK_TEST_VERSION: ${{ github.sha}}
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests:${{ github.sha }}
@@ -111,7 +112,6 @@ jobs:
       contents: read
     env:
       CHAINLINK_ENV_USER: ${{ github.actor }}
-      SLACK_USER: ${{ inputs.slackMemberID }}
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: ${{ secrets.QA_SLACK_CHANNEL }}
       TEST_LOG_LEVEL: info

From 6279dbac86dcd2a6d855157d1752fcbc9d0c1d90 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Tue, 6 Aug 2024 15:48:44 -0400
Subject: [PATCH 21/26] README linting

---
 integration-tests/ccip-tests/README.md        |   5 +-
 .../ccip-tests/testconfig/README.md           | 226 ++++++++++++++----
 2 files changed, 180 insertions(+), 51 deletions(-)

diff --git a/integration-tests/ccip-tests/README.md b/integration-tests/ccip-tests/README.md
index fb7be0879c..f7182338f7 100644
--- a/integration-tests/ccip-tests/README.md
+++ b/integration-tests/ccip-tests/README.md
@@ -42,8 +42,9 @@ For example, if you want to override the `Network` input in test and want to run
 
 **Please note that the secrets should NOT be checked in to the repo and should be kept locally.**
 
-We recommend against changing the content of [sample-secrets.toml](./testconfig/examples/secrets.toml.example). Please create a new file and set it as the secrets file.
-You can run the command to ignore the changes to the file.
+We recommend against changing the content of [secrets.toml.example](./testconfig/examples/secrets.toml.example). Please create a new file and set it as the secrets file.
+
+You can run this command to ignore any changes to the file.
 
 ```bash
 git update-index --skip-worktree <path-to-secrets-file>
diff --git a/integration-tests/ccip-tests/testconfig/README.md b/integration-tests/ccip-tests/testconfig/README.md
index ee5e85d26e..e22a5e4d59 100644
--- a/integration-tests/ccip-tests/testconfig/README.md
+++ b/integration-tests/ccip-tests/testconfig/README.md
@@ -1,11 +1,12 @@
 # CCIP Configuration
 
-The CCIP configuration is used to specify the test configuration for running the CCIP integration tests. 
+The CCIP configuration is used to specify the test configuration for running the CCIP integration tests.
 The configuration is specified in a TOML file. The configuration is used to specify the test environment, test type, test parameters, and other necessary details for running the tests.
 The test config is read in following order:
-- The test reads the default configuration from [ccip-default.toml](./tomls/ccip-default.toml). 
-- The default can be overridden by specifying the test config in a separate file. 
-  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_CONFIG_OVERRIDE` environment variable. 
+
+- The test reads the default configuration from [ccip-default.toml](./tomls/ccip-default.toml).
+- The default can be overridden by specifying the test config in a separate file.
+  - The file content needs to be encoded in base64 format and set in `BASE64_CCIP_CONFIG_OVERRIDE` environment variable.
   - The config mentioned in this file will override the default config.
   - Example override file - [override.toml.example](./examples/override.toml.example)
 - If there are sensitive details like private keys, credentials in test config, they can be specified in a separate dotenv file as env vars
@@ -13,8 +14,10 @@ The test config is read in following order:
   - Example secret file - [.testsecrets.example](./examples/.testsecrets.example)
 
 ## CCIP.ContractVersions
+
 Specifies contract versions of different contracts to be referred by test.
 Supported versions are:
+
 - **PriceRegistry**: '1.2.0', 'Latest'
 - **OffRamp**: '1.2.0', 'Latest'
 - **OnRamp**: '1.2.0', 'Latest'
@@ -22,6 +25,7 @@ Supported versions are:
 - **CommitStore**: '1.2.0', 'Latest'
 
 Example Usage:
+
 ```toml
 [CCIP.ContractVersions]
 PriceRegistry = "1.2.0"
@@ -32,14 +36,17 @@ CommitStore = "1.2.0"
 ```
 
 ## CCIP.Deployments
-CCIP Deployment contains all necessary contract addresses for various networks. This is mandatory if the test are to be run for [existing deployments](#ccipgroupstestgroupexistingdeployment) 
+
+CCIP Deployment contains all necessary contract addresses for various networks. This is mandatory if the test are to be run for [existing deployments](#ccipgroupstestgroupexistingdeployment)
 The deployment data can be specified -
- - Under `CCIP.Deployments.Data` field with value as stringify format of json. 
- - Under `CCIP.Deployments.DataFile` field with value as the path of the file containing the deployment data in json format.
+
+- Under `CCIP.Deployments.Data` field with value as stringify format of json.
+- Under `CCIP.Deployments.DataFile` field with value as the path of the file containing the deployment data in json format.
 
 The json schema is specified in https://github.com/smartcontractkit/ccip/blob/ccip-develop/integration-tests/ccip-tests/contracts/laneconfig/parse_contracts.go#L96
 
 Example Usage:
+
 ```toml
 [CCIP.Deployments]
 Data = """
@@ -95,32 +102,39 @@ Data = """
 }
 """
 ```
-Or 
+
+Or,
+
 ```toml
 [CCIP.Deployments]
 DataFile = '<path/to/deployment.json>'
 ```
 
 ## CCIP.Env 
+
 Specifies the environment details for the test to be run on.
 Mandatory fields are:
+
 - **Networks**: [CCIP.Env.Networks](#ccipenvnetworks)
 - **NewCLCluster**: [CCIP.Env.NewCLCluster](#ccipenvnewclcluster) - This is mandatory if the test needs to deploy Chainlink nodes.
 - **ExistingCLCluster**: [CCIP.Env.ExistingCLCluster](#ccipenvexistingclcluster) - This is mandatory if the test needs to run on existing Chainlink nodes to deploy ccip jobs.
 
 Test needs network/chain details to be set through configuration. This configuration is mandatory for running the tests.
 you have option to set the network details in two ways:
-1. Using [CCIP.Env.Networks](#ccipenvnetworks) 
+
+1. Using [CCIP.Env.Networks](#ccipenvnetworks)
 2. Using a separate network config file -
-   * refer to the example - [network_config.toml.example](./examples/network_config.toml.example)
-   * once all necessary values are set, encode the toml file content in base64 format,
-   * set the base64'ed string content in `BASE64_NETWORK_CONFIG` environment variable.
+   - refer to the example - [network_config.toml.example](./examples/network_config.toml.example)
+   - once all necessary values are set, encode the toml file content in base64 format,
+   - set the base64'ed string content in `BASE64_NETWORK_CONFIG` environment variable.
 
 ### CCIP.Env.Networks
+
 Specifies the network details for the test to be run.
 The NetworkConfig is imported from https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L39
 
 #### CCIP.Env.Networks.selected_networks
+
 It denotes the network names in which tests will be run. These networks are used to deploy ccip contracts and set up lanes between them.
 If more than 2 networks are specified, then lanes will be set up between all possible pairs of networks.
 
@@ -131,6 +145,7 @@ The name of the networks are taken from [known_networks](https://github.com/smar
 If the network is not present in known_networks, then the network details can be specified in the config file itself under the following `EVMNetworks` key.
 
 #### CCIP.Env.Network.EVMNetworks
+
 Specifies the network config to be used while creating blockchain EVMClient for test. 
 It is a map of network name to EVMNetworks where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `EVMNetwork`. 
 The EVMNetwork is imported from [EVMNetwork](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/blockchain/config.go#L43) in chainlink-testing-framework.
@@ -138,21 +153,24 @@ The EVMNetwork is imported from [EVMNetwork](https://github.com/smartcontractkit
 If `CCIP.Env.Network.EVMNetworks` config is not set for a network name specified under `CCIP.Env.Networks.selected_networks`, test will try to find the corresponding network config from defined networks in `MappedNetworks` under [known_networks.go](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/networks/known_networks.go)
 
 #### CCIP.Env.Network.AnvilConfigs
-If the test needs to run on chains created using Anvil, then the AnvilConfigs can be specified. 
-It is a map of network name to `AnvilConfig` where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `AnvilConfig`. 
-The AnvilConfig is imported from [AnvilConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L20) in chainlink-testing-framework.
 
+If the test needs to run on chains created using Anvil, then the AnvilConfigs can be specified.
+It is a map of network name to `AnvilConfig` where key is network name specified under `CCIP.Env.Networks.selected_networks` and value is `AnvilConfig`.
+The AnvilConfig is imported from [AnvilConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/network.go#L20) in chainlink-testing-framework.
 
 **The following network configs are required for tests running on live networks. It can be ignored if the tests are running on simulated networks.**
 Refer to [secrets.toml.example](./examples/secrets.toml.example) for details.
 
 #### CCIP.ENV.Network.RpcHttpUrls
+
 RpcHttpUrls is the RPC HTTP endpoints for each network, key is the network name as declared in selected_networks slice.
 
 #### CCIP.ENV.Network.RpcWsUrls
+
 RpcWsUrls is the RPC WS endpoints for each network, key is the network name as declared in selected_networks slice.
 
 #### CCIP.ENV.Network.WalletKeys
+
 WalletKeys is the private keys for each network, key is the network name as declared in selected_networks slice.
 
 Example Usage of Network Config:
@@ -201,69 +219,95 @@ block_time = 1
 ```
 
 ### CCIP.Env.NewCLCluster
-The NewCLCluster config holds the overall deployment configuration for Chainlink nodes. 
+
+The NewCLCluster config holds the overall deployment configuration for Chainlink nodes.
 
 #### CCIP.Env.NewCLCluster.NoOfNodes
+
 Specifies the number of Chainlink nodes to be deployed.
 
 #### CCIP.Env.NewCLCluster.Common
+
 Specifies the common configuration for all Chainlink nodes if they share the same configuration.
-##### Name: 
+
+##### Name
+
 Name of the node.
-##### NeedsUpgrade: 
+
+##### NeedsUpgrade
+
 Indicates if the node needs an upgrade during test.
-##### ChainlinkImage:
+
+##### ChainlinkImage
+
 Configuration for the Chainlink image.
 
-##### ChainlinkUpgradeImage:
+##### ChainlinkUpgradeImage
+
 Configuration for the Chainlink upgrade image. It is used when the node needs an upgrade.
 
-##### BaseConfigTOML:
+##### BaseConfigTOML
+
 String containing the base configuration toml content for the Chainlink node config.
 
-##### CommonChainConfigTOML:
+##### CommonChainConfigTOML
+
 String containing the common chain configuration toml content for all EVMNodes in chainlink node config.
 
-##### ChainConfigTOMLByChain:
+##### ChainConfigTOMLByChain
+
 String containing the chain-specific configuration toml content for individual EVMNodes in chainlink node config. This is keyed by chain ID.
 
-##### DBImage:
+##### DBImage
+
 Database image for the Chainlink node.
 
-##### DBTag:
+##### DBTag
+
 Database tag/version for the Chainlink node.
 
 #### CCIP.Env.NewCLCluster.Nodes
+
 Specifies the configuration for individual nodes if they differ from the common configuration. The fields are the same as the common configuration.
 
 #### CCIP.Env.NewCLCluster.NodeMemory
+
 Specifies the memory to be allocated for each Chainlink node. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.NodeCPU
+
 Specifies the CPU to be allocated for each Chainlink node. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBMemory
+
 Specifies the memory to be allocated for the database. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBCPU
+
 Specifies the CPU to be allocated for the database. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.IsStateful
+
 Specifies whether the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBStorageClass
+
 Specifies the storage class for the database. This is valid only if the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBCapacity
+
 Specifies the capacity of the database. This is valid only if the deployment is StatefulSet on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.PromPgExporter
+
 Specifies whether to enable Prometheus PostgreSQL exporter. This is valid only if the deployment is on Kubernetes.
 
 #### CCIP.Env.NewCLCluster.DBArgs
+
 Specifies the arguments to be passed to the database. This is valid only if the deployment is on Kubernetes.
 
 Example Usage:
+
 ```toml
 [CCIP.Env.NewCLCluster]
 NoOfNodes = 17
@@ -293,29 +337,42 @@ FeeCapDefault = '200 gwei'
 ```
 
 ### CCIP.Env.ExistingCLCluster
-The ExistingCLCluster config holds the overall connection configuration for existing Chainlink nodes. 
-It is needed when the tests are to be run on Chainlink nodes already deployed on some environment. 
-If this is specified, test will not need to connect to k8 namespace using [CCIP.Env.EnvToConnect](#ccipenvenvtoconnect) . 
+
+The ExistingCLCluster config holds the overall connection configuration for existing Chainlink nodes.
+It is needed when the tests are to be run on Chainlink nodes already deployed on some environment.
+If this is specified, test will not need to connect to k8 namespace using [CCIP.Env.EnvToConnect](#ccipenvenvtoconnect).
 Test can directly connect to the existing Chainlink nodes using node credentials without knowing the k8 namespace details.
 
 #### CCIP.Env.ExistingCLCluster.Name
+
 Specifies the name of the existing Chainlink cluster. This is used to identify the cluster in the test.
 
 #### CCIP.Env.ExistingCLCluster.NoOfNodes
+
 Specifies the number of Chainlink nodes in the existing cluster.
 
 #### CCIP.Env.ExistingCLCluster.NodeConfigs
+
 Specifies the configuration for individual nodes in the existing cluster. Each node config contains the following fields to connect to the Chainlink node:
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.URL
+
 The URL of the Chainlink node.
-##### CCIP.Env.ExistingCLCluster.NodeConfigs.Email 
+
+##### CCIP.Env.ExistingCLCluster.NodeConfigs.Email
+
 The username/email of the Chainlink node credential.
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.Password
+
 The password of the Chainlink node credential.
+
 ##### CCIP.Env.ExistingCLCluster.NodeConfigs.InternalIP
+
 The internal IP of the Chainlink node.
 
 Example Usage:
+
 ```toml
 [CCIP.Env.ExistingCLCluster]
 Name = 'crib-sample'
@@ -354,23 +411,30 @@ InternalIP = 'app-node-5'
 ```
 
 ### CCIP.Env.EnvToConnect
+
 This is specified when the test needs to connect to already existing k8s namespace. User needs to have access to the k8 namespace to run the tests through specific kubeconfig file.
 Example usage:
+
 ```toml
 [CCIP.Env]
 EnvToConnect="load-ccip-c8972"
 ```
+
 ### CCIP.ENV.TTL
+
 Specifies the time to live for the k8 namespace. This is used to terminate the namespace after the tests are run. This is only valid if the tests are run on k8s.
 Example usage:
+
 ```toml
 [CCIP.Env]
 TTL = "11h"
 ```
 
 ### CCIP.Env.Logging
+
 Specifies the logging configuration for the test. Imported from [LoggingConfig](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/logging.go#L11) in chainlink-testing-framework.
 Example usage:
+
 ```toml
 [CCIP.Env.Logging]
 test_log_collect = false # if set to true will save logs even if test did not fail
@@ -393,53 +457,67 @@ dashboard_url = "/d/6vjVx-1V8/ccip-long-running-tests"
 ```
 
 ### CCIP.Env.Lane.LeaderLaneEnabled
+
 Specifies whether to enable the leader lane feature. This setting is only applicable for new deployments.
 
 ## CCIP.Groups
+
 Specifies the test config specific to each test type. Available test types are:
+
 - **CCIP.Groups.load**
 - **CCIP.Groups.smoke**
 - **CCIP.Groups.chaos**
 
 ### CCIP.Groups.[testgroup].KeepEnvAlive
+
 Specifies whether to keep the k8 namespace alive after the test is run. This is only valid if the tests are run on k8s.
 
 ### CCIP.Groups.[testgroup].BiDirectionalLane
-Specifies whether to set up bi-directional lanes between networks. 
+
+Specifies whether to set up bi-directional lanes between networks.
 
 ### CCIP.Groups.[testgroup].CommitAndExecuteOnSameDON
+
 Specifies whether commit and execution jobs are to be run on the same Chainlink node.
 
 ### CCIP.Groups.[testgroup].NoOfCommitNodes
+
 Specifies the number of nodes on which commit jobs are to be run. This needs to be lesser than the total number of nodes mentioned in [CCIP.Env.NewCLCluster.NoOfNodes](#ccipenvnewclclusternoofnodes) or [CCIP.Env.ExistingCLCluster.NoOfNodes](#ccipenvexistingclclusternoofnodes).
 If the value of total nodes is `n`, then the max value of NoOfCommitNodes should be less than `n-1`. As the first node is used for bootstrap job.
 If the NoOfCommitNodes is lesser than `n-1`, then the remaining nodes are used for execution jobs if `CCIP.Groups.[testgroup].CommitAndExecuteOnSameDON` is set to false.
 
 ### CCIP.Groups.[testgroup].TokenConfig
+
 Specifies the token configuration for the test. The token configuration is used to set up tokens and token pools for all chains.
 
 #### CCIP.Groups.[testgroup].TokenConfig.NoOfTokensPerChain
+
 Specifies the number of tokens to be set up for each chain.
 
 #### CCIP.Groups.[testgroup].TokenConfig.WithPipeline
-Specifies whether to set up token pipelines in commit jobspec. If set to false, the token prices will be set with DynamicPriceGetterConfig. 
+
+Specifies whether to set up token pipelines in commit jobspec. If set to false, the token prices will be set with DynamicPriceGetterConfig.
 
 #### CCIP.Groups.[testgroup].TokenConfig.TimeoutForPriceUpdate
-Specifies the timeout to wait for token and gas price updates to be available in price registry for each chain. 
+
+Specifies the timeout to wait for token and gas price updates to be available in price registry for each chain.
 
 #### CCIP.Groups.[testgroup].TokenConfig.NoOfTokensWithDynamicPrice
+
 Specifies the number of tokens to be set up with dynamic price update. The rest of the tokens will be set up with static price. This is only valid if [WithPipeline](#ccipgroupstestgrouptokenconfigwithpipeline) is set to false.
 
 #### CCIP.Groups.[testgroup].TokenConfig.DynamicPriceUpdateInterval
+
 Specifies the interval for dynamic price update for tokens. This is only valid if [NoOfTokensWithDynamicPrice](#ccipgroupstestgrouptokenconfignooftokenswithdynamicprice) is set to value greater tha zero.
 
 #### CCIP.Groups.[testgroup].TokenConfig.CCIPOwnerTokens
+
 Specifies the tokens to be owned by the CCIP owner. If this is false, the tokens and pools will be owned by an address other than rest of CCIP contract admin addresses.
 This is applicable only if the contract versions are '1.5' or higher.
 
 Example Usage:
-```toml
 
+```toml
 [CCIP.Groups.load.TokenConfig]
 TimeoutForPriceUpdate = '15m'
 NoOfTokensPerChain = 60
@@ -449,27 +527,36 @@ CCIPOwnerTokens = true
 ```
 
 ### CCIP.Groups.[testgroup].MsgDetails
-Specifies the ccip message details to be sent by the test. 
+
+Specifies the ccip message details to be sent by the test.
+
 #### CCIP.Groups.[testgroup].MsgDetails.MsgType
+
 Specifies the type of message to be sent. The supported message types are:
+
 - **Token**
 - **Data**
 - **DataWithToken**
 
 #### CCIP.Groups.[testgroup].MsgDetails.DestGasLimit
+
 Specifies the gas limit for the destination chain. This is used to in `ExtraArgs` field of CCIPMessage. Change this to 0, if you are doing ccip-send to an EOA in the destination chain.
 
 #### CCIP.Groups.[testgroup].MsgDetails.DataLength
+
 Specifies the length of data to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Data' or 'DataWithToken'.
 
 #### CCIP.Groups.[testgroup].MsgDetails.NoOfTokens
+
 Specifies the number of tokens to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Token' or 'DataWithToken'.
 It needs to be less than or equal to [NoOfTokensPerChain](#ccipgroupstestgrouptokenconfignooftokensperchain) specified in the test config.
 
 #### CCIP.Groups.[testgroup].MsgDetails.TokenAmount
+
 Specifies the amount for each token to be sent in the message. This is only valid if [MsgType](#ccipgroupstestgroupmsgdetailsmsgtype) is set to 'Token' or 'DataWithToken'.
 
 Example Usage:
+
 ```toml
 [CCIP.Groups.smoke.MsgDetails]
 MsgType = 'DataWithToken' 
@@ -480,15 +567,19 @@ AmountPerToken = 1
 ```
 
 ### CCIP.Groups.[testgroup].MulticallInOneTx
+
 Specifies whether to send multiple ccip messages in a single transaction.
 
 ### CCIP.Groups.[testgroup].NoOfSendsInMulticall
+
 Specifies the number of ccip messages to be sent in a single transaction. This is only valid if [MulticallInOneTx](#ccipgroupstestgroupmulticallinonetx) is set to true.
 
 ### CCIP.Groups.[testgroup].PhaseTimeout
+
 The test validates various events in a ccip request lifecycle, like commit, execute, etc. This field specifies the timeout for each phase in the lifecycle.
 The timeout is calculated from the time the previous phase event is received.
 The following contract events are validated:
+
 - **CCIPSendRequested on OnRamp**
 - **CCIPSendRequested event log to be Finalized**
 - **ReportAccepted on CommitStore**
@@ -496,13 +587,16 @@ The following contract events are validated:
 - **ExecutionStateChanged on OffRamp**
 
 ### CCIP.Groups.[testgroup].LocalCluster
+
 Specifies whether the test is to be run on a local docker. If set to true, the test environment will be set up on a local docker.
 
 ### CCIP.Groups.[testgroup].ExistingDeployment
+
 Specifies whether the test is to be run on existing deployments. If set to true, the test will use the deployment data specified in [CCIP.Deployments](#ccipdeployments) for interacting with the ccip contracts.
 If the deployment data does not contain the required contract addresses, the test will fail.
 
 ### CCIP.Groups.[testgroup].ReuseContracts
+
 Test loads contract/lane config from [contracts.json](../contracts/laneconfig/contracts.json) if no lane config is specified in [CCIP.Deployments](#ccipdeployments)
 If a certain contract is present in the contracts.json, the test will use the contract address from the contracts.json.
 This field specifies whether to reuse the contracts from [contracts.json](../contracts/laneconfig/contracts.json)
@@ -510,58 +604,74 @@ For example if the contracts.json contains the contract address for PriceRegistr
 If `ReuseContracts` is set to false, the test will redeploy the contract instead of using the contract address from contracts.json.
 
 ### CCIP.Groups.[testgroup].NodeFunding
+
 Specified the native token funding for each Chainlink node. It assumes that the native token decimals is 18.
 The funding is done by the private key specified in [CCIP.Env.Networks](#ccipenvnetworks) for each network.
 The funding is done only if the test is run on local docker or k8s. This is not applicable for [existing deployments](#ccipgroupstestgroupexistingdeployment) is set to true.
 
 ### CCIP.Groups.[testgroup].NetworkPairs
-Specifies the network pairs for which the test is to be run. The test will set up lanes only between the specified network pairs. 
+
+Specifies the network pairs for which the test is to be run. The test will set up lanes only between the specified network pairs.
 If the network pairs are not specified, the test will set up lanes between all possible pairs of networks mentioned in selected_networks in [CCIP.Env.Networks](#ccipenvnetworksselectednetworks)
 
 ### CCIP.Groups.[testgroup].NoOfNetworks
-Specifies the number of networks to be used for the test. 
-If the number of networks is greater than the total number of networks specified in [CCIP.Env.Networks.selected_networks](#ccipenvnetworksselectednetworks) :
+
+Specifies the number of networks to be used for the test.
+If the number of networks is greater than the total number of networks specified in [CCIP.Env.Networks.selected_networks](#ccipenvnetworksselectednetworks):
+
 - the test will fail if the networks are live networks.
 - the test will create equal number of replicas of the first network with a new chain id if the networks are simulated networks. 
   For example, if the `selected_networks` is ['SIMULATED_1','SIMULATED_2'] and `NoOfNetworks` is 3, the test will create 1 more network config by copying the network config of `SIMULATED_1` with a different chain id and use that as 3rd network.
 
 ### CCIP.Groups.[testgroup].NoOfRoutersPerPair
+
 Specifies the number of routers to be set up for each network.
 
 ### CCIP.Groups.[testgroup].MaxNoOfLanes
+
 Specifies the maximum number of lanes to be set up between networks. If this values is not set, the test will set up lanes between all possible pairs of networks mentioned in `selected_networks` in [CCIP.Env.Networks](#ccipenvnetworksselectednetworks).
 For example, if `selected_networks = ['SIMULATED_1', 'SIMULATED_2', 'SIMULATED_3']`, and `MaxNoOfLanes` is set to 2, it denotes that the test will randomly select the 2 lanes between all possible pairs `SIMULATED_1`, `SIMULATED_2`, and `SIMULATED_3` for the test run.
 
 ### CCIP.Groups.[testgroup].DenselyConnectedNetworkChainIds
-This is applicable only if [MaxNoOfLanes](#ccipgroupstestgroupmaxnooflanes) is specified. 
+
+This is applicable only if [MaxNoOfLanes](#ccipgroupstestgroupmaxnooflanes) is specified.
 Specifies the chain ids for networks to be densely connected. If this is provided the test will include all possible pairs of networks mentioned in `DenselyConnectedNetworkChainIds`.
 The rest of the networks will be connected randomly based on the value of `MaxNoOfLanes`.
 
 ### CCIP.Groups.[testgroup].ChaosDuration
+
 Specifies the duration for which the chaos experiment is to be run. This is only valid if the test type is 'chaos'.
 
 ### CCIP.Groups.[testgroup].USDCMockDeployment
+
 Specifies whether to deploy USDC mock contract for the test. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 The following fields are used for various parameters in OCR2 commit and execution jobspecs. All of these are only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
+
 ### CCIP.Groups.[testgroup].CommitOCRParams
+
 Specifies the OCR parameters for the commit job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].ExecuteOCRParams
+
 Specifies the OCR parameters for the execute job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].CommitInflightExpiry
+
 Specifies the value for the `InflightExpiry` in commit job's offchain config. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 ### CCIP.Groups.[testgroup].OffRampConfig
+
 Specifies the offramp configuration for the execution job. This is only valid if the test is not run on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 This is used to set values for following fields in execution jobspec's offchain and onchain config:
+
 - **OffRampConfig.MaxDataBytes**
 - **OffRampConfig.BatchGasLimit**
 - **OffRampConfig.InflightExpiry**
 - **OffRampConfig.RootSnooze**
 
 Example Usage:
+
 ```toml
 [CCIP.Groups.load]
 CommitInflightExpiry = '5m'
@@ -593,43 +703,53 @@ BatchGasLimit = 11000000
 MaxDataBytes = 1000
 InflightExpiry = '5m'
 RootSnooze = '5m'
-
 ```
 
 ### CCIP.Groups.[testgroup].StoreLaneConfig
+
 This is only valid if the tests are run on remote runners in k8s. If set to true, the test will store the lane config in the remote runner.
 
 ### CCIP.Groups.[testgroup].LoadProfile
-Specifies the load profile for the test. Only valid if the testgroup is 'load'. 
+
+Specifies the load profile for the test. Only valid if the testgroup is 'load'.
 
 ### CCIP.Groups.[testgroup].LoadProfile.LoadFrequency.[DestNetworkName]
 
 #### CCIP.Groups.[testgroup].LoadProfile.RequestPerUnitTime
+
 Specifies the number of requests to be sent per unit time. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TimeUnit
+
 Specifies the unit of time for the load profile. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.StepDuration
+
 Specifies the duration for each step in the load profile. This is applicable to all networks if [LoadFrequency](#ccipgroupstestgrouploadprofileloadfrequencydestnetworkname) is not specified for a destination network.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TestDuration
+
 Specifies the total duration for the load test.
 
 #### CCIP.Groups.[testgroup].LoadProfile.NetworkChaosDelay
+
 Specifies the duration network delay used for `NetworkChaos` experiment. This is only valid if the test is run on k8s and not on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 #### CCIP.Groups.[testgroup].LoadProfile.WaitBetweenChaosDuringLoad
+
 If there are multiple chaos experiments, this specifies the duration to wait between each chaos experiment. This is only valid if the test is run on k8s and not on [existing deployments](#ccipgroupstestgroupexistingdeployment).
 
 #### CCIP.Groups.[testgroup].LoadProfile.SkipRequestIfAnotherRequestTriggeredWithin
+
 If a request is triggered within this duration, the test will skip sending another request during load run. For Example, if `SkipRequestIfAnotherRequestTriggeredWithin` is set to `40m`, and a request is triggered at 0th second, the test will skip sending another request for another 40m.
 This particular field is used to avoid sending multiple requests in a short duration during load run.
 
 #### CCIP.Groups.[testgroup].LoadProfile.OptimizeSpace
-This is used internally to optimize memory usage during load run. If set to true, after the initial lane set up is over the test will discard the lane config to save memory. 
-The test will only store contract addresses strictly necessary to trigger/validate ccip-send requests. 
+
+This is used internally to optimize memory usage during load run. If set to true, after the initial lane set up is over the test will discard the lane config to save memory.
+The test will only store contract addresses strictly necessary to trigger/validate ccip-send requests.
 Except for following contracts all other contract addresses will be discarded after the initial lane set up -
+
 - Router
 - ARM
 - CommitStore
@@ -637,37 +757,45 @@ Except for following contracts all other contract addresses will be discarded af
 - OnRamp
 
 #### CCIP.Groups.[testgroup].LoadProfile.FailOnFirstErrorInLoad
+
 If set to true, the test will fail on the first error encountered during load run. If set to false, the test will continue to run even if there are errors during load run.
 
 #### CCIP.Groups.[testgroup].LoadProfile.SendMaxDataInEveryMsgCount
-Specifies the number of requests to send with maximum data in every mentioned count iteration. 
+
+Specifies the number of requests to send with maximum data in every mentioned count iteration.
 For example, if `SendMaxDataInEveryMsgCount` is set to 5, the test will send ccip message with max allowable data length(as set in onRamp config) in every 5th request.
 
 #### CCIP.Groups.[testgroup].LoadProfile.TestRunName
+
 Specifies the name of the test run. This is used to identify the test run in CCIP test dashboard or logs. If multiple tests are run with same `TestRunName`, the test results will be aggregated under the same test run in grafana dashboard.
 This is used when multiple iterations of tests are run against same release version to aggregate the results under same dashboard view.
 
 #### CCIP.Groups.[testgroup].LoadProfile.MsgProfile
+
 Specifies the message profile for the test. The message profile is used to set up multiple ccip message details during load test.
 
 ##### CCIP.Groups.[testgroup].LoadProfile.MsgProfile.Frequencies
-Specifies the frequency of each message profile. 
+
+Specifies the frequency of each message profile.
 For example, if `Frequencies` is set to [1, 2, 3], the test will send 1st message profile 1 time, 2nd message profile 2 times, and 3rd message profile 3 times in each iteration. Each iteration will be defined by (1+2+3) = 6 requests.
 Example Breakdown:
+
 - Frequencies = [4, 12, 3, 1]
 - Total Sum of Frequencies = 4 + 12 + 3 + 1 = 20
 - Percentages:
-   - Message Type 1: (4 / 20) * 100% = 20%
-   - Message Type 2: (12 / 20) * 100% = 60%
-   - Message Type 3: (3 / 20) * 100% = 15%
-   - Message Type 4: (1 / 20) * 100% = 5%
+  - Message Type 1: (4 / 20) * 100% = 20%
+  - Message Type 2: (12 / 20) * 100% = 60%
+  - Message Type 3: (3 / 20) * 100% = 15%
+  - Message Type 4: (1 / 20) * 100% = 5%
  These percentages reflect how often each message type should appear in the total set of messages.
  Please note - if the total set of messages is not equal to the multiple of sum of frequencies, the percentages will not be accurate.
 
 ##### CCIP.Groups.[testgroup].LoadProfile.MsgProfile.MsgDetails
+
 Specifies the message details for each message profile. The fields are the same as [CCIP.Groups.[testgroup].MsgDetails](#ccipgroupstestgroupmsgdetails).
 
 example usage:
+
 ```toml
 # to represent 20%, 60%, 15%, 5% of the total messages
 [CCIP.Groups.load.LoadProfile.MsgProfile]
@@ -696,4 +824,4 @@ DataLength = 10000
 MsgType = 'Data'
 DestGasLimit = 2500000
 DataLength = 10000
-```
\ No newline at end of file
+```

From 7590d31bd2e4f93accb56f4de5878aeed3bda795 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Tue, 6 Aug 2024 16:38:41 -0400
Subject: [PATCH 22/26] Fix build image

---
 .github/workflows/ccip-load-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 62d2a798d3..9f9340866b 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -57,7 +57,7 @@ jobs:
         with:
           cl_repo: smartcontractkit/chainlink-ccip
           cl_ref: ${{ env.CHAINLINK_VERSION }}
-          push_tag: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink:${{ env.CHAINLINK_VERSION }}
+          push_tag: ${{ env.CHAINLINK_IMAGE }}:${{ env.CHAINLINK_VERSION }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Collect Metrics

From ce777146393e5a11b5bfbdf770b64322180f9338 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 28 Aug 2024 09:16:52 -0400
Subject: [PATCH 23/26] Fixes testsecrets merge issues (#1384)

Fixing CI issues in testsecrets changes
---
 .github/workflows/ccip-load-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
index 9f9340866b..f88f5bd143 100644
--- a/.github/workflows/ccip-load-tests.yml
+++ b/.github/workflows/ccip-load-tests.yml
@@ -22,7 +22,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip
+  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   CHAINLINK_VERSION: ${{ github.sha}}
   INPUT_CHAINLINK_TEST_VERSION: ${{ github.sha}}
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests:${{ github.sha }}

From 62c40e9d0b994362c49c4520102a61f6641ffa68 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 28 Aug 2024 10:04:53 -0400
Subject: [PATCH 24/26] Fix go mod mismatch

---
 integration-tests/go.mod | 4 ++--
 integration-tests/go.sum | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index e20e98bcf9..f63a30fa31 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -258,7 +258,7 @@ require (
 	github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503 // indirect
 	github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
 	github.com/grafana/pyroscope-go v1.1.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -314,7 +314,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 5789a6ccc2..a573b2c41f 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -806,8 +806,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 h1:wQ0FnSeeb
 github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0=
 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
 github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/graph-gophers/dataloader v5.0.0+incompatible h1:R+yjsbrNq1Mo3aPG+Z/EKYrXrXXUNJHOgbRt+U6jOug=
@@ -1034,9 +1034,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=

From 4861d03571a23fcf194f951d0b0ff9fe0ddf0fa4 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 28 Aug 2024 10:09:33 -0400
Subject: [PATCH 25/26] load go mod tidy

---
 integration-tests/load/go.mod | 4 ++--
 integration-tests/load/go.sum | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index ef077ba768..95d92451e0 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -234,7 +234,7 @@ require (
 	github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503 // indirect
 	github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
 	github.com/grafana/pyroscope-go v1.1.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -291,7 +291,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index 3e5d20d303..7ec40db665 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -780,8 +780,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 h1:wQ0FnSeeb
 github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0=
 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
 github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
+github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
 github.com/graph-gophers/dataloader v5.0.0+incompatible h1:R+yjsbrNq1Mo3aPG+Z/EKYrXrXXUNJHOgbRt+U6jOug=
@@ -1006,9 +1006,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=

From aa250c9f68ae8439d8954ea25fd653285e41a7af Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 28 Aug 2024 11:08:28 -0400
Subject: [PATCH 26/26] Fix readme

---
 integration-tests/ccip-tests/README.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/integration-tests/ccip-tests/README.md b/integration-tests/ccip-tests/README.md
index f7182338f7..39b8360428 100644
--- a/integration-tests/ccip-tests/README.md
+++ b/integration-tests/ccip-tests/README.md
@@ -35,21 +35,11 @@ For example, if you want to override the `Network` input in test and want to run
         ```
 
 3. Secrets - You also need to set some secrets. This is a mandatory step needed to run the tests. Please refer to [.testsecrets.example](./examples/.testsecrets.example) for the list of secrets and instruction how to set them up.
-   - The chainlink image and tag are required secrets for all the tests.
+   - The chainlink image is a required secret for all tests
    - If you are running tests in live networks like testnet and mainnet, you need to set the secrets (rpc urls and private keys) for the respective networks.
-   - If you are running tests in simulated networks no network specific secrets are required.
-   here is a sample secrets.toml file, for running the tests in simulated networks, with the chainlink image and tag set as secrets:
 
 **Please note that the secrets should NOT be checked in to the repo and should be kept locally.**
 
-We recommend against changing the content of [secrets.toml.example](./testconfig/examples/secrets.toml.example). Please create a new file and set it as the secrets file.
-
-You can run this command to ignore any changes to the file.
-
-```bash
-git update-index --skip-worktree <path-to-secrets-file>
-```
-
 ## Running the Tests
 
 There are two ways to run the tests: