From 5a901ee44b52ebe4487fb35201569639e3628e23 Mon Sep 17 00:00:00 2001
From: lukaszcl <120112546+lukaszcl@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:22:25 +0200
Subject: [PATCH] Fix ccip

---
 .github/e2e-tests.yml                                 | 5 ++---
 .github/workflows/ccip-chaos-tests.yml                | 6 ++----
 .github/workflows/run-e2e-tests-reusable-workflow.yml | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
index ea57170dc30..ccc119189d0 100644
--- a/.github/e2e-tests.yml
+++ b/.github/e2e-tests.yml
@@ -988,7 +988,6 @@ runner-test-matrix:
       TEST_SUITE: chaos
       TEST_TRIGGERED_BY: ccip-cron-chaos-eth
       TEST_LOG_LEVEL: debug
-      DATABASE_URL: postgresql://postgres:node@localhost:5432/chainlink_test?sslmode=disable
 
   - id: ccip-tests/load/ccip_test.go:^TestLoadCCIPStableWithPodChaosDiffCommitAndExec
     path: integration-tests/ccip-tests/load/ccip_test.go
@@ -996,12 +995,12 @@ runner-test-matrix:
     runs_on: ubuntu-latest
     workflows:
       - Automation On Demand Tests
-      - E2E CCIP Chaos Tests
+      # Disabled until CCIP-2555 is resolved
+      # - E2E CCIP Chaos Tests
     test_cmd: cd integration-tests/ccip-tests/load && DETACH_RUNNER=false go test -run '^TestLoadCCIPStableWithPodChaosDiffCommitAndExec' -v -test.parallel=4 -timeout 120m -count=1 -json
     test_env_vars:
       TEST_SUITE: chaos
       TEST_TRIGGERED_BY: ccip-cron-chaos-eth
       TEST_LOG_LEVEL: debug
-      DATABASE_URL: postgresql://postgres:node@localhost:5432/chainlink_test?sslmode=disable
             
   # END: CCIP tests
\ No newline at end of file
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
index 2f501f34dae..e6e9fb6e0d9 100644
--- a/.github/workflows/ccip-chaos-tests.yml
+++ b/.github/workflows/ccip-chaos-tests.yml
@@ -18,12 +18,10 @@ jobs:
     with:
       chainlink_version: ${{ github.sha }}
       require_chainlink_image_versions_in_qa_ecr: ${{ github.sha }}
-      test_ids: 'ccip-tests/chaos/ccip_test.go'
-      # Disabled until CCIP-2555 is resolved
-      # test_ids: 'ccip-tests/chaos/ccip_test.go,ccip-tests/load/ccip_test.go:^TestLoadCCIPStableWithPodChaosDiffCommitAndExec'
+      test_workflow: E2E CCIP Chaos Tests
       test_log_level: debug
       slack_notification_after_tests: on_failure
-      slack_notification_after_tests_channel_id: "D04ENK9VDFA"
+      slack_notification_after_tests_channel_id: '#D04ENK9VDFA'
       slack_notification_after_tests_name: CCIP Chaos E2E Tests
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
diff --git a/.github/workflows/run-e2e-tests-reusable-workflow.yml b/.github/workflows/run-e2e-tests-reusable-workflow.yml
index 198d870a612..57d93349282 100644
--- a/.github/workflows/run-e2e-tests-reusable-workflow.yml
+++ b/.github/workflows/run-e2e-tests-reusable-workflow.yml
@@ -694,6 +694,7 @@ jobs:
           E2E_TEST_PYROSCOPE_SERVER_URL: ${{ matrix.tests.pyroscope_env != '' && secrets.QA_PYROSCOPE_INSTANCE || '' }}
           E2E_TEST_PYROSCOPE_KEY: ${{ matrix.tests.pyroscope_env != '' && secrets.QA_PYROSCOPE_KEY || '' }}
           E2E_TEST_PYROSCOPE_ENABLED: ${{ matrix.tests.pyroscope_env != '' && 'true' || '' }}
+          DATABASE_URL: postgresql://postgres:node@localhost:5432/chainlink_test?sslmode=disable
         with:
           test_command_to_run: ${{ matrix.tests.test_cmd }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage -hidepassingtests=false -hidepassinglogs
           test_download_vendor_packages_command: make gomod