From 78e847796a00b4ca659a24692efbb81ef107c624 Mon Sep 17 00:00:00 2001
From: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
Date: Tue, 29 Oct 2024 18:06:52 +0530
Subject: [PATCH 1/4] Fix test image publish

---
 .github/workflows/integration-tests-publish.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
index 5f4768027e..a4aa14ee83 100644
--- a/.github/workflows/integration-tests-publish.yml
+++ b/.github/workflows/integration-tests-publish.yml
@@ -2,13 +2,12 @@ name: Test Image Publish
 # Publish the compiled integration tests
 on:
   push:
-    tags:
-      - "v*"
     branches:
-      - ccip-develop
+      - develop
   workflow_dispatch:
 
 env:
+  ECR_TAG: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:develop
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
 
 jobs:
@@ -34,14 +33,15 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      - name: Setup Other Tags
+      - name: Setup Other Tags If Not Workflow Dispatch
         id: tags
+        if: github.event_name != 'workflow_dispatch'
         run: |
-          echo 'release_tag="${{ format('{0}.dkr.ecr.{1}.amazonaws.com/chainlink-ccip-tests:{2}', secrets.QA_AWS_ACCOUNT_NUMBER, secrets.QA_AWS_REGION, github.ref_name) }}"' >> $GITHUB_OUTPUT
+          echo "other_tags=${ECR_TAG}" >> $GITHUB_OUTPUT
       - name: Build Image
         uses: smartcontractkit/.github/actions/ctf-build-test-image@a5e4f4c8fbb8e15ab2ad131552eca6ac83c4f4b3 # ctf-build-test-image@0.1.0
         with:
-          other_tags: ${{steps.tags.outputs.release_tag}}
+          other_tags: ${{ steps.tags.outputs.other_tags }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}

From 4d18a706cbab1e5c76ad19e9230bb736c81ef3e2 Mon Sep 17 00:00:00 2001
From: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
Date: Tue, 29 Oct 2024 18:29:24 +0530
Subject: [PATCH 2/4] Customizing for CCIP

---
 .github/workflows/integration-tests-publish.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
index a4aa14ee83..536d2897ee 100644
--- a/.github/workflows/integration-tests-publish.yml
+++ b/.github/workflows/integration-tests-publish.yml
@@ -2,12 +2,13 @@ name: Test Image Publish
 # Publish the compiled integration tests
 on:
   push:
+    tags:
+      - "v*"
     branches:
-      - develop
+      - ccip-develop
   workflow_dispatch:
 
 env:
-  ECR_TAG: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:develop
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
 
 jobs:
@@ -37,11 +38,14 @@ jobs:
         id: tags
         if: github.event_name != 'workflow_dispatch'
         run: |
-          echo "other_tags=${ECR_TAG}" >> $GITHUB_OUTPUT
+          echo 'release_tag="${{ format('{0}.dkr.ecr.{1}.amazonaws.com/chainlink-ccip-tests:{2}', secrets.QA_AWS_ACCOUNT_NUMBER, secrets.QA_AWS_REGION, github.ref_name) }}"' >> $GITHUB_OUTPUT
       - name: Build Image
         uses: smartcontractkit/.github/actions/ctf-build-test-image@a5e4f4c8fbb8e15ab2ad131552eca6ac83c4f4b3 # ctf-build-test-image@0.1.0
         with:
-          other_tags: ${{ steps.tags.outputs.other_tags }}
+          other_tags: ${{ steps.tags.outputs.release_tag }}
+          repository: 'chainlink-ccip-tests'
+          tag: ${{ github.sha }}
+          suites: 'chaos migration reorg smoke soak benchmark load ccip-tests/load ccip-tests/smoke ccip-tests/chaos'
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}

From 0ef0d303feb84c703ad0b813d210443bccb3f8f1 Mon Sep 17 00:00:00 2001
From: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
Date: Tue, 29 Oct 2024 21:48:54 +0530
Subject: [PATCH 3/4] Trigger CI workflow


From 72309495e67769f2d10710b3c87d5be7c3120fa4 Mon Sep 17 00:00:00 2001
From: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com>
Date: Thu, 31 Oct 2024 22:39:13 +0530
Subject: [PATCH 4/4] Removing condition to check non src changes

---
 .github/workflows/solidity-foundry.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index 36cfb660e1..b9bcd0555a 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -133,7 +133,6 @@ jobs:
               - '!contracts/src/v0.8/vendor/**'
 
   tests:
-    if: ${{ needs.changes.outputs.non_src_changes == 'true' || needs.changes.outputs.sol_modified_added == 'true' }}
     strategy:
       fail-fast: false
       matrix: