Merge branch 'develop' into re-3199/updater-root-module-go.mod-ref

.changeset/clean-files-beg.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Adding OCR3 promwrapper to LLO #internal

.changeset/dull-readers-rush.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Reporting number of OCR3 instances running using promwrapper #internal

.changeset/hot-islands-dress.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal refactor: inject ocr secrets via env instead of config

.changeset/many-crews-wave.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal refactor update nodes changeset to support mcms

.changeset/six-coins-mix.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#bugfix fix: duplicate chain id in chain config dialog

.github/actions/setup-ci-core-tests/action.yml

@@ -0,0 +1,61 @@
+name: Setup CI Core Tests
+description: |
+  Shared setup steps for ci-core.
+  Note: Other actions should not be called from this action. There is
+  weird behavior when nesting reusable actions.
+inputs:
+
+  go-mod-download-directory:
+    description: |
+      The directory to run go mod download in. If not provided, it will not run go mod download.
+    required: false
+    default: ""
+
+  db-url:
+    description: |
+      The expected database URL
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Touching core/web/assets/index.html
+      shell: bash
+      run: mkdir -p core/web/assets && touch core/web/assets/index.html
+
+    - name: Download Go vendor packages
+      shell: bash
+      run: go mod download
+
+    - name: Go Mod Download (optional)
+      if: ${{ inputs.go-mod-download-directory != '' }}
+      shell: bash
+      working-directory: ${{ inputs.go-mod-download-directory }}
+      run: go mod download
+
+    - name: Build binary
+      shell: bash
+      run: go build -o chainlink.test .
+
+    - name: Setup DB
+      shell: bash
+      run: ./chainlink.test local db preparetest
+      env:
+        CL_DATABASE_URL: ${{ inputs.db-url }}
+
+    - name: Install LOOP Plugins
+      shell: bash
+      run: |
+        pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds)
+        go install ./cmd/chainlink-feeds
+        popd
+        pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-data-streams)
+        go install ./mercury/cmd/chainlink-mercury
+        popd
+        pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana)
+        go install ./pkg/solana/cmd/chainlink-solana
+        popd
+        pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer)
+        go install ./pkg/chainlink/cmd/chainlink-starknet
+        popd
+

.github/e2e-tests.yml

@@ -935,58 +935,6 @@ runner-test-matrix:
 
   # START: CCIPv1.6 tests
 
-  - id: smoke/ccip/ccip_test.go:*
-    path: integration-tests/smoke/ccip/ccip_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E Core Tests
-      - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test ccip_test.go -timeout 25m -test.parallel=2 -count=1 -json
-    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      E2E_JD_VERSION: 0.6.0
-
-  - id: smoke/ccip/ccip_token_transfer_test.go:*
-    path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E Core Tests
-      - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -test.parallel=1 -count=1 -json
-    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      E2E_JD_VERSION: 0.6.0
-
-  - id: smoke/ccip/ccip_ooo_execution_test.go:*
-    path: integration-tests/smoke/ccip/ccip_ooo_execution_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E Core Tests
-      - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_ooo_execution_test.go -timeout 16m -test.parallel=1 -count=1 -json
-    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
-      E2E_JD_VERSION: 0.6.0
-
-  - id: smoke/ccip/ccip_usdc_test.go:*
-    path: integration-tests/smoke/ccip/ccip_usdc_test.go
-    test_env_type: docker
-    runs_on: ubuntu-latest
-    triggers:
-      - PR E2E Core Tests
-      - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test ccip_usdc_test.go -timeout 18m -test.parallel=1 -count=1 -json
-    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
-    test_env_vars:
-      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
-      E2E_JD_VERSION: 0.6.0
-
   - id: smoke/ccip/ccip_message_limitations_test.go:*
     path: integration-tests/smoke/ccip/ccip_message_limitations_test.go
     test_env_type: docker

.github/integration-in-memory-tests.yml

@@ -48,4 +48,28 @@ runner-test-matrix:
       - PR Integration CCIP Tests
     test_cmd: cd integration-tests/contracts && go test ccipreader_test.go -timeout 5m -test.parallel=1 -count=1 -json
 
+  - id: smoke/ccip/ccip_usdc_test.go:*
+    path: integration-tests/smoke/ccip/ccip_usdc_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_usdc_test.go -timeout 18m -test.parallel=1 -count=1 -json
+
+  - id: smoke/ccip/ccip_ooo_execution_test.go:*
+    path: integration-tests/smoke/ccip/ccip_ooo_execution_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_ooo_execution_test.go -timeout 16m -test.parallel=1 -count=1 -json
+
+  - id: smoke/ccip/ccip_token_transfer_test.go:*
+    path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -test.parallel=1 -count=1 -json
+
   # END: CCIP tests