From 7f575962e86ba67ec50b106a28f289cb1ea6fd2b Mon Sep 17 00:00:00 2001
From: "app-token-issuer-infra-releng[bot]"
 <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 13:59:50 +0000
Subject: [PATCH 1/3] [automated] bump solana image to v1.17.34 (#717)

* fix: handle new location for e2e test solana version

* [automated] bump solana dependencies

---------

Co-authored-by: aalu1418 <50029043+aalu1418@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 integration-tests/testconfig/default.toml | 2 +-
 scripts/install-solana-ci.sh              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration-tests/testconfig/default.toml b/integration-tests/testconfig/default.toml
index d064fc9c9..525ef3de9 100644
--- a/integration-tests/testconfig/default.toml
+++ b/integration-tests/testconfig/default.toml
@@ -37,7 +37,7 @@ inside_k8 = false
 network = "localnet"
 user = "default"
 stateful_db = false
-devnet_image = "solanalabs/solana:v1.17.33"
+devnet_image = "solanalabs/solana:v1.17.34"
 
 [OCR2]
 node_count = 6
diff --git a/scripts/install-solana-ci.sh b/scripts/install-solana-ci.sh
index 57c060a00..99db76f2f 100755
--- a/scripts/install-solana-ci.sh
+++ b/scripts/install-solana-ci.sh
@@ -2,5 +2,5 @@
 
 set -euxo pipefail
 
-sh -c "$(curl -sSfL https://release.solana.com/v1.17.33/install)"
+sh -c "$(curl -sSfL https://release.solana.com/v1.17.34/install)"
 echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$PATH" >> $GITHUB_ENV

From 2b32fda72aa6ff4fb65aa7aa4a34d7d3bd37e835 Mon Sep 17 00:00:00 2001
From: Aaron Lu <50029043+aalu1418@users.noreply.github.com>
Date: Wed, 22 May 2024 09:42:03 -0600
Subject: [PATCH 2/3] bump ctf to v1.28.15 (#719)

* bump ctf to v1.28.15

* remove soak test reference
---
 .github/actions/build-test-image/action.yml | 2 +-
 Makefile                                    | 4 ----
 integration-tests/go.mod                    | 2 +-
 integration-tests/go.sum                    | 4 ++--
 integration-tests/scripts/buildTestImage    | 2 +-
 integration-tests/test.Dockerfile           | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml
index ae57a5616..6a2e50d60 100644
--- a/.github/actions/build-test-image/action.yml
+++ b/.github/actions/build-test-image/action.yml
@@ -57,7 +57,7 @@ runs:
         build-args: |
           BASE_IMAGE=${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/test-base-image
           IMAGE_VERSION=${{ steps.version.outputs.version }}
-          SUITES="soak smoke"
+          SUITES="smoke"
         AWS_REGION: ${{ inputs.QA_AWS_REGION }}
         AWS_ROLE_TO_ASSUME: ${{ inputs.QA_AWS_ROLE_TO_ASSUME }}
     - name: Print Image Built
diff --git a/Makefile b/Makefile
index 4030022bd..288ea388e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,10 +84,6 @@ test_smoke:
 	cd ./integration-tests &&\
 	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
 
-test_ocr_soak:
-	cd ./integration-tests &&\
-	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestfmt
-
 gomodtidy:
 	go mod tidy
 	cd ./integration-tests && go mod tidy
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 3bf21f6cb..13d79e8bb 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/rs/zerolog v1.30.0
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240516150131-e1be553a9d10
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240510181707-46b1311a5a83
-	github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4
+	github.com/smartcontractkit/chainlink-testing-framework v1.28.15
 	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240515225456-aeb9f4d50d65
 	github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240515225456-aeb9f4d50d65
 	github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 79c3005cc..e959f07bf 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1416,8 +1416,8 @@ github.com/smartcontractkit/chainlink-feeds v0.0.0-20240422130241-13c17a91b2ab h
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20240422130241-13c17a91b2ab/go.mod h1:RPUY7r8GxgzXxS1ijtU1P/fpJomOXztXgUbEziNmbCA=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240508155030-1024f2b55c69 h1:ssh/w3oXWu+C6bE88GuFRC1+0Bx/4ihsbc80XMLrl2k=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240508155030-1024f2b55c69/go.mod h1:VsfjhvWgjxqWja4q+FlXEtX5lu8BSxn10xRo6gi948g=
-github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4 h1:XorHCAKux5+/jYsnGLRYOMBSW7Q3pKZJaxqRCZOW/UU=
-github.com/smartcontractkit/chainlink-testing-framework v1.28.15-0.20240520085642-b994043307a4/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
+github.com/smartcontractkit/chainlink-testing-framework v1.28.15 h1:mga7N6jtXQ3UOCt43IdsEnCMBh9xjOWPaE9BiM6kr6Q=
+github.com/smartcontractkit/chainlink-testing-framework v1.28.15/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240328204215-ac91f55f1449 h1:fX/xmGm1GBsD1ZZnooNT+eWA0hiTAqFlHzOC5CY4dy8=
 github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240328204215-ac91f55f1449/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 h1:LQmRsrzzaYYN3wEU1l5tWiccznhvbyGnu2N+wHSXZAo=
diff --git a/integration-tests/scripts/buildTestImage b/integration-tests/scripts/buildTestImage
index b76598951..22c70e098 100755
--- a/integration-tests/scripts/buildTestImage
+++ b/integration-tests/scripts/buildTestImage
@@ -13,7 +13,7 @@ cd "$SCRIPT_DIR"/../../ || exit 1
 TAG_VERSION="${1}"
 BASE_IMAGE_VERSION="${2}"
 SUITES=$3
-DEFAULT_SUITES="smoke soak"
+DEFAULT_SUITES="smoke"
 ACCOUNT=$(aws sts get-caller-identity | jq -r .Account)
 AWS_BASE="${ACCOUNT}".dkr.ecr.us-west-2.amazonaws.com
 TAG="${AWS_BASE}"/chainlink-solana-tests:"${TAG_VERSION}"
diff --git a/integration-tests/test.Dockerfile b/integration-tests/test.Dockerfile
index 5964b75df..8b7feeafc 100644
--- a/integration-tests/test.Dockerfile
+++ b/integration-tests/test.Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE
 ARG IMAGE_VERSION=latest
 FROM ${BASE_IMAGE}:${IMAGE_VERSION}
 
-ARG SUITES=smoke soak
+ARG SUITES=smoke
 
 COPY . testdir/
 WORKDIR /go/testdir

From 822b5f3cd76dd30ac536205ce4f1c78469c4a629 Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Wed, 22 May 2024 10:49:45 -0600
Subject: [PATCH 3/3] [TT-1032] Replace usages of gotestfmt with
 gotestloghelper (#694)

* [TT-1032] Replace usages of gotestfmt with gotestloghelper

* Add metrics collection for test results

* relay metrics collect and logs cleanup

* fix missing id in tests publish workflow

* bump gotestloghelper and actions to get latest versions

* copy paste error

* remove cgo_enabled

* merge conflict fix

---------

Co-authored-by: Aaron Lu <50029043+aalu1418@users.noreply.github.com>
---
 .github/actions/build-test-image/action.yml   |  6 +++---
 .github/workflows/e2e_custom_cl.yml           | 11 ++++++-----
 .github/workflows/e2e_testnet_daily.yml       | 19 ++++++++++---------
 .../workflows/integration-tests-publish.yml   |  2 +-
 .github/workflows/relay.yml                   | 14 +++++++++++++-
 .github/workflows/soak.yml                    | 10 +++++-----
 .github/workflows/sonar-scan.yml              |  2 +-
 .tool-versions                                |  5 ++---
 Makefile                                      |  4 ++--
 shell.nix                                     |  6 +++++-
 10 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml
index 6a2e50d60..b1643afe8 100644
--- a/.github/actions/build-test-image/action.yml
+++ b/.github/actions/build-test-image/action.yml
@@ -28,7 +28,7 @@ runs:
   steps:
     - name: Check if image exists
       id: check-image
-      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
       with:
         repository: chainlink-solana-tests
         tag: ${{ inputs.tag }}
@@ -41,14 +41,14 @@ runs:
         path: ${{ inputs.artifacts_path }}
     - name: Get CTF Version
       id: version
-      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
       with:
         go-project-path: ./integration-tests
         module-name: github.com/smartcontractkit/chainlink-testing-framework
         enforce-semantic-tag: false
     - name: Build and Publish Test Runner
       if: steps.check-image.outputs.exists == 'false'
-      uses: smartcontractkit/chainlink-github-actions/docker/build-push@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+      uses: smartcontractkit/chainlink-github-actions/docker/build-push@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
       with:
         tags: |
           ${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests:${{ inputs.tag }}
diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml
index 6036cfdc9..cd63b51b1 100644
--- a/.github/workflows/e2e_custom_cl.yml
+++ b/.github/workflows/e2e_custom_cl.yml
@@ -90,7 +90,7 @@ jobs:
           fi
       - name: Check if image exists
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           repository: chainlink
           tag: solana.${{ env.CUSTOM_CORE_REF || github.event.inputs.cl_branch_ref || github.sha }}
@@ -98,7 +98,7 @@ jobs:
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Build Image
         if: steps.check-image.outputs.exists == 'false'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           should_checkout: true
           cl_repo: smartcontractkit/chainlink
@@ -129,11 +129,12 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: e2e_custom_run_smoke_tests
+          id: solana-e2e-smoke
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: E2E Custom Run Smoke Tests
+          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
       - name: Get core ref from PR body
         if: github.event_name == 'pull_request'
@@ -168,9 +169,9 @@ jobs:
           # shellcheck disable=SC2086
           echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@7f2d504e0b6ebd4aa5ece371d9c5eb9762803ca0 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
-          test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           download_contract_artifacts_path: ${{ env.CONTRACT_ARTIFACTS_PATH }} 
           go_mod_path: ./integration-tests/go.mod
diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml
index a554d0fd4..a6acfe644 100644
--- a/.github/workflows/e2e_testnet_daily.yml
+++ b/.github/workflows/e2e_testnet_daily.yml
@@ -42,7 +42,7 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: e2e_testnet_daily-changes
+          id: solana-e2e-detect-changes
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -124,7 +124,7 @@ jobs:
     steps:
       - name: Check if image exists
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           repository: chainlink-solana-tests
           tag: ${{ needs.get_solana_sha.outputs.sha }}
@@ -152,7 +152,7 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: e2e_testnet_daily-build-artifacts
+          id: solana-e2e-build-artivacts
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -183,7 +183,7 @@ jobs:
     steps:
       - name: Check if image exists
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           repository: chainlink
           tag: solana.${{ github.sha }}
@@ -191,7 +191,7 @@ jobs:
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Build Image
         if: steps.check-image.outputs.exists == 'false'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           should_checkout: true
           cl_repo: smartcontractkit/chainlink
@@ -214,7 +214,7 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: e2e_testnet_daily-build-test-image
+          id: solana-e2e-build-test-image
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -268,18 +268,19 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: e2e_custom_run_daily_testnet_smoke_tests
+          id: solana-e2e-daily
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: E2E Run Daily Smoke Tests
+          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
       - name: Checkout the repo
         uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
-          test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaGauntletOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaGauntletOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage
           go_mod_path: ./integration-tests/go.mod
           cl_repo: ${{ env.CL_ECR }}
           cl_image_tag: solana.${{ github.sha }}
diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
index f03809af1..a07fdea5d 100644
--- a/.github/workflows/integration-tests-publish.yml
+++ b/.github/workflows/integration-tests-publish.yml
@@ -60,7 +60,7 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: integration-tests-publish-image
+          id: solana-e2e-publish
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
index d9e47aea2..5eefe2890 100644
--- a/.github/workflows/relay.yml
+++ b/.github/workflows/relay.yml
@@ -11,6 +11,16 @@ jobs:
     name: Relay Run Unit Tests
     runs-on: ubuntu-latest
     steps:
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        with:
+          id: solana-relay-unit
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: Relay Run Unit Tests
+          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
       - name: Checkout sources
         uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       - name: Setup go
@@ -18,6 +28,8 @@ jobs:
         with:
           go-version-file: "go.mod"
           check-latest: true
+      - name: Install gotestloghelper
+        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
       - name: Check go mod tidy
         run: |
           go mod tidy
@@ -30,7 +42,7 @@ jobs:
       - name: Build
         run: go build -v ./pkg/...
       - name: Test
-        run: go test ./pkg/... -v -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt
+        run: go test ./pkg/... -json -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
       - name: Test with the race detector enabled
         run: go test ./pkg/... -v -race -count=10 -timeout=15m -covermode=atomic -coverpkg=./... -coverprofile=race_coverage.txt
       - name: Upload Go test results
diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml
index 1ceb94155..182904a82 100644
--- a/.github/workflows/soak.yml
+++ b/.github/workflows/soak.yml
@@ -52,7 +52,7 @@ jobs:
     steps:
       - name: Check if image exists
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           repository: chainlink-solana-tests
           tag: ${{ github.sha }}
@@ -92,14 +92,14 @@ jobs:
     steps:
       - name: Check if image exists
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           repository: chainlink
           tag: solana.${{ github.sha }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Build Image
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           should_checkout: true
           cl_repo: smartcontractkit/chainlink
@@ -142,9 +142,9 @@ jobs:
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
-          test_command_to_run: cd ./integration-tests && go test -timeout 5h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_command_to_run: cd ./integration-tests && go test -timeout 5h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage
           go_mod_path: ./integration-tests/go.mod
           cl_repo: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
           cl_image_tag: solana.${{ github.sha }}
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index 2e225e4f1..8e5b8fd57 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Wait for Workflows
         id: wait
-        uses: smartcontractkit/chainlink-github-actions/utils/wait-for-workflows@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16
+        uses: smartcontractkit/chainlink-github-actions/utils/wait-for-workflows@b49a9d04744b0237908831730f8553f26d73a94b # v2.3.17
         with:
           max-timeout: "1200"
           polling-interval: "30"
diff --git a/.tool-versions b/.tool-versions
index 52ebfcbb2..3e82cc776 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,10 +1,9 @@
-nodejs 18.13.0
+nodejs 18.20.2
 yarn 1.22.19
 rust 1.59.0
-golang 1.21.6
+golang 1.21.7
 golangci-lint 1.55.2
 pulumi 3.40.1
-ginkgo 2.5.1
 actionlint 1.6.22
 shellcheck 0.8.0
 helm 3.9.4
diff --git a/Makefile b/Makefile
index 288ea388e..7c6f01314 100644
--- a/Makefile
+++ b/Makefile
@@ -39,13 +39,13 @@ ifeq ($(OSFLAG),$(OSX))
 	asdf plugin add shellcheck || true
 	asdf plugin add kubectl || true
 	asdf install
+	go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
 endif
 ifeq ($(OSFLAG),$(LINUX))
 ifneq ($(CI),true)
 	# install nix
 	sh <(curl -L https://nixos-nix-install-tests.cachix.org/serve/vij683ly7sl95nnhb67bdjjfabclr85m/install) --daemon --tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve --nix-extra-conf-file ./nix.conf
 endif
-	go install github.com/onsi/ginkgo/v2/ginkgo@v$(shell cat ./.tool-versions | grep ginkgo | sed -En "s/ginkgo.(.*)/\1/p")
 endif
 
 .PHONY: projectserum_version
@@ -82,7 +82,7 @@ test_relay_unit:
 
 test_smoke:
 	cd ./integration-tests &&\
-	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
+	SELECTED_NETWORKS=SIMULATED go test -timeout 24h -count=1 -json $(args) -run TestSolanaOCRV2Smoke ./smoke 2>&1 | tee /tmp/gotest.log | gotestloghelper -json -tlogprefix -singlepackage -color
 
 gomodtidy:
 	go mod tidy
diff --git a/shell.nix b/shell.nix
index dd6049a1d..f00b6b6ee 100644
--- a/shell.nix
+++ b/shell.nix
@@ -39,7 +39,11 @@ pkgs.mkShell {
 
   LD_LIBRARY_PATH = lib.makeLibraryPath [pkgs.zlib stdenv.cc.cc.lib]; # lib64
 
-
   # Avoids issues with delve
   CGO_CPPFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0";
+
+  shellHook = ''
+    # install gotestloghelper
+    go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
+  '';
 }