[CCIP-2937] Fixes Conflicts and Run Issues with CCIP E2E Tests Merge (#…

…14070) * Fixes CI conflicts * Fixes config path * Separate CCIP smoke tests * Change repo for compatibility tests * Remove references to separate CCIP repo * Callout needed updates * Remove CCIP Upgrade Test --------- Co-authored-by: asoliman <[email protected]>
smartcontractkit · Aug 12, 2024 · 92111d0 · 92111d0
1 parent df9e35a
commit 92111d0
Show file tree

Hide file tree

Showing 23 changed files with 475 additions and 3,581 deletions.
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
@@ -14,6 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # TODO: TT-1470 - Update image names as we solidify new realease strategy
   CL_ECR: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-ccip-tests:${{ github.sha }}
   MOD_CACHE_VERSION: 1
@@ -43,7 +44,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         with:
-          cl_repo: smartcontractkit/chainlink-ccip
+          cl_repo: smartcontractkit/chainlink
           cl_ref: ${{ github.sha }}
           push_tag: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink:${{ github.sha }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}

diff --git a/.github/workflows/ccip-client-compatibility-tests.yml b/.github/workflows/ccip-client-compatibility-tests.yml
@@ -29,6 +29,7 @@ on:
         type: string
 
 env:
+  # TODO: TT-1470 - Update image names as we solidify new realease strategy
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/ccip
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   MOD_CACHE_VERSION: 2
@@ -46,7 +47,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
-          repository: smartcontractkit/ccip
+          repository: smartcontractkit/chainlink
           fetch-depth: 0
       - name: Check for go.mod changes
         id: changes
@@ -282,7 +283,7 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
-          repository: smartcontractkit/ccip
+          repository: smartcontractkit/chainlink
           ref: ${{ needs.select-versions.outputs.chainlink_version }}
       - name: Build Chainlink Image
         uses: ./.github/actions/build-chainlink-image
@@ -484,7 +485,7 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
-          repository: smartcontractkit/ccip
+          repository: smartcontractkit/chainlink
           ref: ${{ needs.select-versions.outputs.chainlink_version }}
       - name: Prepare Base64 TOML override
         uses: ./.github/actions/setup-create-base64-config

diff --git a/.github/workflows/ccip-live-network-tests.yml b/.github/workflows/ccip-live-network-tests.yml
@@ -25,6 +25,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # TODO: TT-1470 - Update image names as we solidify new realease strategy
   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}}

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
@@ -17,6 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # TODO: TT-1470 - Update image names as we solidify new realease strategy
   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}}
@@ -50,7 +51,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         with:
-          cl_repo: smartcontractkit/chainlink-ccip
+          cl_repo: smartcontractkit/chainlink
           cl_ref: ${{ env.CHAINLINK_VERSION }}
           push_tag: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink:${{ env.CHAINLINK_VERSION }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}