Adjust path to ccip-config. (#16267) (#16273)

* Adjust path to ccip-config. (#16267) The docker image typically gets ran with a mounted volume of /chainlink which will remove our local /chainlink/ccip-config path. * Bump package.json * Change in e2e tests --------- Co-authored-by: chainchad <[email protected]>
smartcontractkit · Feb 7, 2025 · 15674a1 · 15674a1
1 parent 901f0b4
commit 15674a1
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/.github/actions/build-sign-publish-chainlink/action.yml b/.github/actions/build-sign-publish-chainlink/action.yml
@@ -92,7 +92,7 @@ runs:
         if [[ "${GIT_TAG_TYPE}" = "ccip" ]]; then
           SHARED_BUILD_ARGS=$(cat << EOF
         COMMIT_SHA=${GIT_COMMIT_SHA}
-        CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        CL_CHAIN_DEFAULTS=/ccip-config
         EOF
         )
         else

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -917,8 +917,9 @@ runner-test-matrix:
       - Nightly E2E Tests
     test_cmd: cd integration-tests/migration && go test upgrade_version_test.go -timeout 30m -count=1 -test.parallel=2 -json
     test_env_vars:
-      E2E_TEST_CHAINLINK_IMAGE: public.ecr.aws/chainlink/chainlink
-      E2E_TEST_CHAINLINK_VERSION: '{{ env.LATEST_CHAINLINK_RELEASE_VERSION }}'
+      # Fails after releasing 2.20 - this needs to be adjusted to work well with CCIP
+      E2E_TEST_CHAINLINK_IMAGE: public.ecr.aws/chainlink/ccip
+      E2E_TEST_CHAINLINK_VERSION: '2.20.0-ccip1.5.17'
       E2E_TEST_CHAINLINK_UPGRADE_IMAGE: '{{ env.QA_CHAINLINK_IMAGE }}'
       E2E_TEST_CHAINLINK_UPGRADE_VERSION: '{{ env.DEFAULT_CHAINLINK_VERSION }}'
 

diff --git a/.goreleaser.develop.yaml b/.goreleaser.develop.yaml
@@ -155,7 +155,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --label=org.opencontainers.image.created={{ .Date }}
         - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
         - --label=org.opencontainers.image.licenses=MIT
@@ -182,7 +182,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
         - --build-arg=CL_MERCURY_CMD=chainlink-mercury
         - --build-arg=CL_SOLANA_CMD=chainlink-solana
@@ -211,7 +211,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --label=org.opencontainers.image.created={{ .Date }}
         - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
         - --label=org.opencontainers.image.licenses=MIT
@@ -237,7 +237,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
         - --build-arg=CL_MERCURY_CMD=chainlink-mercury
         - --build-arg=CL_SOLANA_CMD=chainlink-solana

diff --git a/.goreleaser.production.yaml b/.goreleaser.production.yaml
@@ -160,7 +160,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --label=org.opencontainers.image.created={{ .Date }}
         - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
         - --label=org.opencontainers.image.licenses=MIT
@@ -188,7 +188,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
         - --build-arg=CL_MERCURY_CMD=chainlink-mercury
         - --build-arg=CL_SOLANA_CMD=chainlink-solana
@@ -218,7 +218,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --label=org.opencontainers.image.created={{ .Date }}
         - --label=org.opencontainers.image.description="node of the decentralized oracle network, bridging on and off-chain computation"
         - --label=org.opencontainers.image.licenses=MIT
@@ -245,7 +245,7 @@ dockers:
         - --pull
         - --build-arg=CHAINLINK_USER=chainlink
         - --build-arg=COMMIT_SHA={{ .FullCommit }}
-        - --build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config
+        - --build-arg=CL_CHAIN_DEFAULTS=/ccip-config
         - --build-arg=CL_MEDIAN_CMD=chainlink-feeds
         - --build-arg=CL_MERCURY_CMD=chainlink-mercury
         - --build-arg=CL_SOLANA_CMD=chainlink-solana

diff --git a/core/chainlink.Dockerfile b/core/chainlink.Dockerfile
@@ -67,7 +67,7 @@ COPY --from=buildgo /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/internal/api/l
 RUN chmod 755 /usr/lib/libwasmvm.*.so
 
 # CCIP specific
-COPY ./cci[p]/confi[g] /chainlink/ccip-config
+COPY ./cci[p]/confi[g] /ccip-config
 ARG CL_CHAIN_DEFAULTS
 ENV CL_CHAIN_DEFAULTS=${CL_CHAIN_DEFAULTS}
 

diff --git a/core/chainlink.goreleaser.Dockerfile b/core/chainlink.goreleaser.Dockerfile
@@ -35,7 +35,7 @@ ENV CL_MEDIAN_CMD=${CL_MEDIAN_CMD} \
   CL_STARKNET_CMD=${CL_STARKNET_CMD}
 
 # CCIP specific
-COPY ./cci[p]/confi[g] /chainlink/ccip-config
+COPY ./cci[p]/confi[g] /ccip-config
 ARG CL_CHAIN_DEFAULTS
 ENV CL_CHAIN_DEFAULTS=${CL_CHAIN_DEFAULTS}
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainlink",
-  "version": "2.20.0-ccip1.5.17",
+  "version": "2.20.0-ccip1.5.18",
   "description": "node of the decentralized oracle network, bridging on and off-chain computation",
   "main": "index.js",
   "scripts": {

diff --git a/tools/goreleaser-config/gen_config.go b/tools/goreleaser-config/gen_config.go
@@ -215,7 +215,7 @@ func docker(id, goos, goarch, environment string, isDevspace bool) config.Docker
 
 	if strings.Contains(id, "ccip") {
 		buildFlagTemplates = append(buildFlagTemplates,
-			"--build-arg=CL_CHAIN_DEFAULTS=/chainlink/ccip-config")
+			"--build-arg=CL_CHAIN_DEFAULTS=/ccip-config")
 	}
 
 	if strings.Contains(id, "plugins") || isDevspace {