diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml index 03ede7fa732d..ae92c186b113 100644 --- a/.github/workflows/ci-core-reusable.yml +++ b/.github/workflows/ci-core-reusable.yml @@ -118,6 +118,10 @@ jobs: ci_run sccache --show-stats ci_run cat /tmp/sccache_log.txt integration: + strategy: + matrix: + # Whether to enable consensus or not. + consensus_env_vars: ["","CONSENSUS_CONFIG_PATH=etc/env/consensus_config.json"], runs-on: [matterlabs-ci-runner] steps: @@ -181,6 +185,8 @@ jobs: run: | ci_run zk server &>server.log & ci_run sleep 5 + env: + PASSED_ENV_VARS: "${{ matrix.consensus_env_vars }}" - name: Run contract verifier run: | @@ -230,6 +236,10 @@ jobs: ci_run cat /tmp/sccache_log.txt external-node: + strategy: + matrix: + # Whether to enable consensus or not. + consensus_env_vars: ["","CONSENSUS_CONFIG_PATH=etc/env/consensus_config.json,EN_CONSENSUS_CONFIG_PATH=etc/env/en_consensus_config.json"], runs-on: [matterlabs-ci-runner] steps: @@ -293,13 +303,17 @@ jobs: run: | ci_run zk server &>server.log & ci_run sleep 30 - + env: + PASSED_ENV_VARS: "${{ matrix.consensus_env_vars }}" + - name: Run external node run: | ci_run zk env ext-node-docker ci_run zk db setup ci_run zk external-node &>ext-node.log & ci_run sleep 30 + env: + PASSED_ENV_VARS: "${{ matrix.consensus_env_vars }}" # TODO(PLA-653): Restore bridge tests for EN. - name: Integration tests diff --git a/etc/env/base/private.toml b/etc/env/base/private.toml index 9cc50e9d32ad..3040955963c7 100644 --- a/etc/env/base/private.toml +++ b/etc/env/base/private.toml @@ -12,7 +12,6 @@ operator_private_key="0x27593fea79697e947890ecbecce7901b0008345e5d7259710d0dd5e5 operator_commit_eth_addr="0xde03a0B5963f75f1C8485B355fF6D30f3093BDE7" [consensus] -config_path="etc/env/consensus_config.json" # generated with zksync_consensus_tools/src/bin/keys.rs # node:public:ed25519:ee717abba6aec5baae5e09d457bd2ffc2f121b576cf4170ce15a68163ce4c868 node_key="node:secret:ed25519:b6666c3be2703e15028bbebd220d2678fde7431038641f36c52f02849595a8ab" diff --git a/etc/env/ext-node-docker.toml b/etc/env/ext-node-docker.toml index d1cf4a11fee4..9e986a4c912c 100644 --- a/etc/env/ext-node-docker.toml +++ b/etc/env/ext-node-docker.toml @@ -37,7 +37,6 @@ default_aa_hash="0x0100038dc66b69be75ec31653c64cb931678299b9b659472772b2550b703f operator_addr="0xde03a0B5963f75f1C8485B355fF6D30f3093BDE7" [en.consensus] -config_path="etc/env/en_consensus_config.json" # generated with zksync_consensus_tools/src/bin/keys.rs # node:public:ed25519:147bb71be895846e1d6f5b1c6a8be53848b82bdafcf66e9dfe6ca65581076a1d node_key="node:secret:ed25519:d56de77c738326c305c64c25bffe1cc94ea7c639cf71ca3ff94229df27f167ac" diff --git a/etc/env/ext-node.toml b/etc/env/ext-node.toml index 5effa8054bfc..3f8378dd0419 100644 --- a/etc/env/ext-node.toml +++ b/etc/env/ext-node.toml @@ -37,7 +37,6 @@ default_aa_hash="0x0100038dc66b69be75ec31653c64cb931678299b9b659472772b2550b703f operator_addr="0xde03a0B5963f75f1C8485B355fF6D30f3093BDE7" [en.consensus] -config_path="etc/env/en_consensus_config.json" # generated with zksync_consensus_tools/src/bin/keys.rs # node:public:ed25519:147bb71be895846e1d6f5b1c6a8be53848b82bdafcf66e9dfe6ca65581076a1d node_key="node:secret:ed25519:d56de77c738326c305c64c25bffe1cc94ea7c639cf71ca3ff94229df27f167ac"