diff --git a/.github/actions/setup-create-base64-config-ccip/action.yml b/.github/actions/setup-create-base64-config-ccip/action.yml index 1e3b45bf2a5..90b4c97e62c 100644 --- a/.github/actions/setup-create-base64-config-ccip/action.yml +++ b/.github/actions/setup-create-base64-config-ccip/action.yml @@ -13,6 +13,8 @@ inputs: description: The networks to run tests against chainlinkVersion: description: The git commit sha to use for the image tag + upgradeVersion: + description: The git commit sha to use for the image tag logstreamLogTargets: description: Where to send logs (e.g. file, loki) customEvmNodes: @@ -32,6 +34,8 @@ runs: SELECTED_NETWORKS: ${{ inputs.selectedNetworks }} EXISTING_NAMESPACE: ${{ inputs.existingNamespace }} TEST_LOG_COLLECT: ${{ inputs.testLogCollect }} + CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }} + UPGRADE_VERSION: ${{ inputs.upgradeVersion }} LOGSTREAM_LOG_TARGETS: ${{ inputs.logstreamLogTargets }} CUSTOM_EVM_NODES: ${{ inputs.customEvmNodes }} EVM_NODE_LOG_LEVEL: ${{ inputs.evmNodeLogLevel }} @@ -108,6 +112,10 @@ runs: EnvToConnect="$EXISTING_NAMESPACE" [CCIP.Env.Network] selected_networks = $selected_networks + [CCIP.Env.NewCLCluster] + [CCIP.Env.NewCLCluster.Common] + [CCIP.Env.NewCLCluster.Common.ChainlinkImage] + version="$CHAINLINK_VERSION" $custom_nodes_toml @@ -126,6 +134,14 @@ runs: EOF + # Check if UPGRADE_VERSION is not empty and append to config.toml + if [ -n "$UPGRADE_VERSION" ]; then + cat << EOF >> config.toml + [CCIP.Env.NewCLCluster.Common.ChainlinkUpgradeImage] + version="$UPGRADE_VERSION" + EOF + fi + BASE64_CONFIG=$(cat config.toml | base64 -w 0) echo ::add-mask::$BASE64_CONFIG echo "base64_config=$BASE64_CONFIG" >> $GITHUB_OUTPUT diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index bccacad25b8..a319e812912 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -272,7 +272,6 @@ jobs: runId: ${{ github.run_id }} testLogCollect: ${{ vars.TEST_LOG_COLLECT }} selectedNetworks: ${{ env.SELECTED_NETWORKS }} - chainlinkImage: ${{ env.CHAINLINK_IMAGE }} chainlinkVersion: ${{ inputs.evm-ref || github.sha }} pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725 pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}