From cb7c2eb96bba881616c4c66ca66044aff8ab018c Mon Sep 17 00:00:00 2001
From: aalu1418 <50029043+aalu1418@users.noreply.github.com>
Date: Wed, 7 Feb 2024 08:35:31 -0700
Subject: [PATCH] switch back to old solana image + pass image via TOML

---
 .github/workflows/e2e_custom_cl.yml      | 11 +++++++++++
 integration-tests/docker/test_env/sol.go |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml
index 6ed2afe61..f563f7900 100644
--- a/.github/workflows/e2e_custom_cl.yml
+++ b/.github/workflows/e2e_custom_cl.yml
@@ -115,6 +115,17 @@ jobs:
         with:
           name: artifacts
           path: ${{ env.CONTRACT_ARTIFACTS_PATH }}
+      - name: Generate config overrides
+        run: | # https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/config/README.md
+          cat << EOF > config.toml
+          [ChainlinkImage]
+          image="${{ env.CL_ECR }}"
+          version="solana.${{ github.event.inputs.cl_branch_ref || github.sha }}"
+          EOF
+
+          BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
+          echo ::add-mask::$BASE64_CONFIG_OVERRIDE
+          echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
diff --git a/integration-tests/docker/test_env/sol.go b/integration-tests/docker/test_env/sol.go
index 8eb7a1f67..ca61645f8 100644
--- a/integration-tests/docker/test_env/sol.go
+++ b/integration-tests/docker/test_env/sol.go
@@ -138,7 +138,7 @@ func (ms *Solana) getContainerRequest() (*tc.ContainerRequest, error) {
 
 	return &tc.ContainerRequest{
 		Name:         ms.ContainerName,
-		Image:        "solanalabs/solana:beta",
+		Image:        "solanalabs/solana:v1.13.3",
 		ExposedPorts: []string{test_env.NatPortFormat(SOL_HTTP_PORT), test_env.NatPortFormat(SOL_WS_PORT)},
 		Env: map[string]string{
 			"SERVER_PORT": "1080",