Merge branch 'develop' into FUN-1340-L1-L2-fee-improvements

.github/workflows/ci-core.yml

@@ -75,7 +75,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-core"
-          slack-message: "golangci-lint failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: "golangci-lint failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
 
   core:
     env:
@@ -209,7 +209,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#topic-data-races"
-          slack-message: "Race tests failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: "Race tests failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
       - name: Collect Path Output
         id: collect-path-output
         env:

.github/workflows/integration-tests-publish.yml

@@ -54,7 +54,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-test-tooling-internal"
-          slack-message: ":x: :mild-panic-intensifies: Publish Integration Test Image failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: ":x: :mild-panic-intensifies: Publish Integration Test Image failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
   build-chainlink-image:
     environment: integration
     # Only run this build for workflow_dispatch

.github/workflows/integration-tests.yml

@@ -27,9 +27,9 @@ on:
         type: string
 
 # Only run 1 of this workflow at a time per PR
-# concurrency:
-#   group: integration-tests-chainlink-${{ github.sha }}-${{ github.run_id }}-${{ inputs.distinct_run_name }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.ref }}-${{ github.repository }}-${{ github.event_name }}--e2e-tests-${{ inputs.distinct_run_name }}
+  cancel-in-progress: true
 
 env:
   # for run-test variables and environment
@@ -967,7 +967,7 @@ jobs:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#team-test-tooling-internal"
-          slack-message: ":x: :mild-panic-intensifies: Node Migration Tests Failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
+          slack-message: ":x: :mild-panic-intensifies: Node Migration Tests Failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
 
   ## Solana Section
   get_solana_sha:

integration-tests/smoke/log_poller_test.go

@@ -46,13 +46,13 @@ func TestLogPollerFewFiltersFinalityTag(t *testing.T) {
 
 // consistency test with no network disruptions with approximate emission of 1000-1100 logs per second for ~110-120 seconds
 // 900 filters are registered
-func TestLogPollerManyFiltersFixedDepth(t *testing.T) {
-	t.Skip("Execute manually, when needed as it runs for a long time")
+func XTestLogPollerManyFiltersFixedDepth(t *testing.T) {
+	t.Skip("Execute manually, when needed as it runs for a long time, remove the X from the test name to run it")
 	executeBasicLogPollerTest(t, test_env.DefaultChainlinkNodeLogScannerSettings)
 }
 
-func TestLogPollerManyFiltersFinalityTag(t *testing.T) {
-	t.Skip("Execute manually, when needed as it runs for a long time")
+func XTestLogPollerManyFiltersFinalityTag(t *testing.T) {
+	t.Skip("Execute manually, when needed as it runs for a long time, remove the X from the test name to run it")
 	executeBasicLogPollerTest(t, test_env.DefaultChainlinkNodeLogScannerSettings)
 }
 

integration-tests/smoke/log_poller_test.go_test_list.json

@@ -23,12 +23,6 @@
     },
     {
       "name": "TestLogPollerReplayFinalityTag"
-    },
-    {
-      "name": "TestLogPollerManyFiltersFixedDepth"
-    },
-    {
-      "name": "TestLogPollerManyFiltersFinalityTag"
     }
   ]
 }