From 85409cfa97d7bf1041e046ce3997b74cb67ee075 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 15:27:08 +0200 Subject: [PATCH 01/32] Let's use environment from zombienet-sdk --- .../zombienet/src/environment.rs | 52 ------------------- integration-tests/zombienet/src/lib.rs | 4 +- integration-tests/zombienet/tests/smoke.rs | 21 +++++--- 3 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 integration-tests/zombienet/src/environment.rs diff --git a/integration-tests/zombienet/src/environment.rs b/integration-tests/zombienet/src/environment.rs deleted file mode 100644 index 14eeaa55a2..0000000000 --- a/integration-tests/zombienet/src/environment.rs +++ /dev/null @@ -1,52 +0,0 @@ -//! Helpers functions to get configuration (e.g. Provider and images) from the env vars -use std::{env, future::Future, pin::Pin}; - -use zombienet_sdk::{LocalFileSystem, Network, NetworkConfig, NetworkConfigExt, OrchestratorError}; - -const DEFAULT_POLKADOT_IMAGE: &str = "docker.io/parity/polkadot:latest"; -const DEFAULT_CUMULUS_IMAGE: &str = "docker.io/parity/polkadot-parachain:latest"; - -#[derive(Debug, Default)] -pub struct Images { - pub polkadot: String, - pub cumulus: String, -} - -#[derive(Debug)] -pub enum Provider { - Native, - K8s, - Docker, -} - -// Use `docker` as default provider -impl From for Provider { - fn from(value: String) -> Self { - match value.to_ascii_lowercase().as_ref() { - "native" => Provider::Native, - "k8s" => Provider::K8s, - _ => Provider::Docker, // default provider - } - } -} - -pub fn get_images_from_env() -> Images { - let polkadot = env::var("POLKADOT_IMAGE").unwrap_or(DEFAULT_POLKADOT_IMAGE.into()); - let cumulus = env::var("CUMULUS_IMAGE").unwrap_or(DEFAULT_CUMULUS_IMAGE.into()); - Images { polkadot, cumulus } -} - -pub fn get_provider_from_env() -> Provider { - env::var("ZOMBIE_PROVIDER").unwrap_or_default().into() -} - -type SpawnResult = Result, OrchestratorError>; -pub fn get_spawn_fn() -> fn(NetworkConfig) -> Pin + Send>> { - let provider = get_provider_from_env(); - - match provider { - Provider::Native => zombienet_sdk::NetworkConfig::spawn_native, - Provider::K8s => zombienet_sdk::NetworkConfig::spawn_k8s, - Provider::Docker => zombienet_sdk::NetworkConfig::spawn_docker, - } -} diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 2c9722545e..668471ecec 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -1,8 +1,6 @@ use anyhow::anyhow; use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder}; -pub mod environment; - pub type Error = Box; // Chain generator command template @@ -15,7 +13,7 @@ const BOB: &str = "bob"; const COLLATOR: &str = "collator"; pub fn small_network() -> Result { - let images = environment::get_images_from_env(); + let images = zombienet_sdk::environment::get_images_from_env(); let config = NetworkConfigBuilder::new() .with_relaychain(|r| { r.with_chain("polkadot-local") diff --git a/integration-tests/zombienet/tests/smoke.rs b/integration-tests/zombienet/tests/smoke.rs index 44c8059fd6..652b322413 100644 --- a/integration-tests/zombienet/tests/smoke.rs +++ b/integration-tests/zombienet/tests/smoke.rs @@ -1,16 +1,21 @@ use std::time::Instant; use subxt::{ext::futures::StreamExt, OnlineClient, PolkadotConfig}; -use zombienet_sdk_tests::{ - environment::{get_images_from_env, get_provider_from_env, get_spawn_fn, Provider}, - small_network, -}; +use zombienet_sdk_tests::small_network; fn dump_provider_and_versions() { - let provider = get_provider_from_env(); - log::info!("Using zombienet provider: {:?}", provider); + use zombienet_sdk::environment::Provider; + let provider = zombienet_sdk::environment::get_provider_from_env(); + log::info!( + "Using zombienet provider: {:?}", + match provider { + Provider::Native => "Native", + Provider::K8s => "K8s", + Provider::Docker => "Docker", + } + ); if let Provider::Docker = provider { - let images = get_images_from_env(); + let images = zombienet_sdk::environment::get_images_from_env(); for image in [images.polkadot, images.cumulus] { let output = std::process::Command::new("docker") @@ -37,7 +42,7 @@ async fn smoke() -> Result<(), anyhow::Error> { // config and env dump_provider_and_versions(); - let spawn_fn = get_spawn_fn(); + let spawn_fn = zombienet_sdk::environment::get_spawn_fn(); let config = small_network().unwrap(); // spawn From e101a666e7d1a16b293e53644dc56abac00a5a48 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 15:34:36 +0200 Subject: [PATCH 02/32] Let's try `env_logger` --- Cargo.lock | 2 +- Cargo.toml | 1 + integration-tests/zombienet/Cargo.toml | 2 +- integration-tests/zombienet/tests/smoke.rs | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 762b514475..ce20a05a3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17582,10 +17582,10 @@ name = "zombienet-sdk-tests" version = "0.1.0" dependencies = [ "anyhow", + "env_logger", "log", "subxt", "tokio", - "tracing-subscriber", "zombienet-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index f24f85de7b..f4165717d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,6 +61,7 @@ encointer-balances-tx-payment-rpc-runtime-api = { version = "~15.1.0", default-f encointer-kusama-runtime = { path = "system-parachains/encointer" } encointer-primitives = { version = "~15.4.0", default-features = false } enumflags2 = { version = "0.7.7" } +env_logger = { version = "0.10.2" } frame-benchmarking = { version = "39.0.0", default-features = false } frame-election-provider-support = { version = "39.0.0", default-features = false } frame-executive = { version = "39.1.0", default-features = false } diff --git a/integration-tests/zombienet/Cargo.toml b/integration-tests/zombienet/Cargo.toml index 93ce161b5b..5bd9b51e26 100644 --- a/integration-tests/zombienet/Cargo.toml +++ b/integration-tests/zombienet/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] subxt = { features = ["native"], workspace = true } tokio = { workspace = true } -tracing-subscriber = { workspace = true } +env_logger = { workspace = true } zombienet-sdk = { workspace = true } log = { workspace = true, default-features = true } anyhow = { workspace = true } diff --git a/integration-tests/zombienet/tests/smoke.rs b/integration-tests/zombienet/tests/smoke.rs index 652b322413..30fb0cd1bc 100644 --- a/integration-tests/zombienet/tests/smoke.rs +++ b/integration-tests/zombienet/tests/smoke.rs @@ -38,7 +38,9 @@ fn dump_provider_and_versions() { #[tokio::test(flavor = "multi_thread")] async fn smoke() -> Result<(), anyhow::Error> { - tracing_subscriber::fmt::init(); + let _ = env_logger::try_init_from_env( + env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"), + ); // config and env dump_provider_and_versions(); From 67c6a6b959c47876358cd1fd694356e77250e040 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 15:47:43 +0200 Subject: [PATCH 03/32] One more nit --- integration-tests/zombienet/src/lib.rs | 4 +--- integration-tests/zombienet/tests/smoke.rs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 668471ecec..2199ebc405 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -1,8 +1,6 @@ use anyhow::anyhow; use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder}; -pub type Error = Box; - // Chain generator command template const CMD_TPL: &str = "chain-spec-generator {{chainName}}"; @@ -12,7 +10,7 @@ const BOB: &str = "bob"; // Collator const COLLATOR: &str = "collator"; -pub fn small_network() -> Result { +pub fn small_network() -> Result { let images = zombienet_sdk::environment::get_images_from_env(); let config = NetworkConfigBuilder::new() .with_relaychain(|r| { diff --git a/integration-tests/zombienet/tests/smoke.rs b/integration-tests/zombienet/tests/smoke.rs index 30fb0cd1bc..c38c1910ff 100644 --- a/integration-tests/zombienet/tests/smoke.rs +++ b/integration-tests/zombienet/tests/smoke.rs @@ -45,11 +45,11 @@ async fn smoke() -> Result<(), anyhow::Error> { // config and env dump_provider_and_versions(); let spawn_fn = zombienet_sdk::environment::get_spawn_fn(); - let config = small_network().unwrap(); + let config = small_network()?; // spawn let now = Instant::now(); - let network = spawn_fn(config).await.unwrap(); + let network = spawn_fn(config).await?; let elapsed = now.elapsed(); log::info!("🚀🚀🚀🚀 network deployed in {:.2?}", elapsed); From d5bfc46fdbb6cad6e0bff6a180b4da6c1c4a4054 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 16:19:52 +0200 Subject: [PATCH 04/32] Let's add more collators? --- integration-tests/zombienet/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 2199ebc405..19a8b7bd11 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -30,6 +30,8 @@ pub fn small_network() -> Result { .chain_spec_command_is_local(true) .with_chain("coretime-polkadot-local") .with_collator(|n| n.with_name(COLLATOR)) + .with_collator(|n| n.with_name(&format!("{}-2", COLLATOR))) + .with_collator(|n| n.with_name(&format!("{}-3", COLLATOR))) }) .build() .map_err(|errs| { From 2e5e8856808c2482604158538ed6efc3d282f42f Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 16:54:40 +0200 Subject: [PATCH 05/32] Return back cumulus instead of coretime --- .github/workflows/test.yml | 2 +- integration-tests/zombienet/src/lib.rs | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4a27b6711e..7ced44db7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -225,7 +225,7 @@ jobs: - name: Build run: | - cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --release --locked + cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot --locked - name: Wait for Docker to Start run: | diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 19a8b7bd11..8d85c48fe3 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -23,15 +23,11 @@ pub fn small_network() -> Result { .with_node(|node| node.with_name(BOB)) }) .with_parachain(|p| { - p.with_id(1005) - .with_default_command("polkadot-parachain") - .with_default_image(images.cumulus.as_str()) - .with_chain_spec_command(CMD_TPL) - .chain_spec_command_is_local(true) - .with_chain("coretime-polkadot-local") - .with_collator(|n| n.with_name(COLLATOR)) - .with_collator(|n| n.with_name(&format!("{}-2", COLLATOR))) - .with_collator(|n| n.with_name(&format!("{}-3", COLLATOR))) + p.with_id(2000).cumulus_based(true).with_collator(|n| { + n.with_name(COLLATOR) + .with_command("polkadot-parachain") + .with_image(images.cumulus.as_str()) + }) }) .build() .map_err(|errs| { From 07758bf0cafdb672f0cab02c8de2fe24a9595860 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 17:33:21 +0200 Subject: [PATCH 06/32] nit --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ced44db7f..f34414bb48 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -235,7 +235,7 @@ jobs: - name: Zombienet smoke test timeout-minutes: 20 run: | - export PATH=$(pwd)/target/release:$PATH + export PATH=$(pwd)/target/debug:$PATH cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From 700eb1e9370bf118ce8ae1626baa4b380a38304d Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 16 Apr 2025 23:41:09 +0200 Subject: [PATCH 07/32] Update .github/workflows/test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f34414bb48..6cc011f76c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,6 +236,7 @@ jobs: timeout-minutes: 20 run: | export PATH=$(pwd)/target/debug:$PATH + export RUST_LOG=zombienet=debug cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From 0ae5ae020676ae423afb478eadd3b9261d6ecb4d Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 10:15:31 +0200 Subject: [PATCH 08/32] Set `CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4` --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6cc011f76c..ee35021941 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -237,6 +237,8 @@ jobs: run: | export PATH=$(pwd)/target/debug:$PATH export RUST_LOG=zombienet=debug + # WIP: TODO: temporary fix + export CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From 1cf55a0eba87b3dff57f39c41fc995a20d1a9257 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 10:57:58 +0200 Subject: [PATCH 09/32] Removed `zombienet=debug` --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee35021941..4acdb728e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,7 +236,6 @@ jobs: timeout-minutes: 20 run: | export PATH=$(pwd)/target/debug:$PATH - export RUST_LOG=zombienet=debug # WIP: TODO: temporary fix export CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml From 80a777184a5fc7cbaeee1012f7b3e9fc8c53ae56 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 11:16:55 +0200 Subject: [PATCH 10/32] ehm, the other one is the problem --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4acdb728e6..eb71af5b31 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -237,7 +237,8 @@ jobs: run: | export PATH=$(pwd)/target/debug:$PATH # WIP: TODO: temporary fix - export CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4 + # export CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4 + export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From f24a8ed71fad4293902cfe9f33a5f5b82f529a52 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 11:17:29 +0200 Subject: [PATCH 11/32] Nit --- integration-tests/zombienet/tests/smoke.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-tests/zombienet/tests/smoke.rs b/integration-tests/zombienet/tests/smoke.rs index c38c1910ff..809ba34243 100644 --- a/integration-tests/zombienet/tests/smoke.rs +++ b/integration-tests/zombienet/tests/smoke.rs @@ -16,6 +16,7 @@ fn dump_provider_and_versions() { if let Provider::Docker = provider { let images = zombienet_sdk::environment::get_images_from_env(); + log::info!("Using Docker images: {:?}", images); for image in [images.polkadot, images.cumulus] { let output = std::process::Command::new("docker") From 7bfbeb3c084b189a33e66b3183fd668d34c8c5a9 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 11:41:52 +0200 Subject: [PATCH 12/32] nit --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb71af5b31..ba0f9395e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -237,7 +237,6 @@ jobs: run: | export PATH=$(pwd)/target/debug:$PATH # WIP: TODO: temporary fix - # export CUMULUS_IMAGE=docker.io/parity/polkadot-parachain:v1.17.4 export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml From 359ee06ae727950f2bb3d923d24fa238198633a7 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 11:42:43 +0200 Subject: [PATCH 13/32] Revert back coretime-polkadot-local --- .github/workflows/test.yml | 2 +- integration-tests/zombienet/src/lib.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba0f9395e7..aefa9c5345 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -225,7 +225,7 @@ jobs: - name: Build run: | - cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot --locked + cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --locked - name: Wait for Docker to Start run: | diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 8d85c48fe3..2199ebc405 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -23,11 +23,13 @@ pub fn small_network() -> Result { .with_node(|node| node.with_name(BOB)) }) .with_parachain(|p| { - p.with_id(2000).cumulus_based(true).with_collator(|n| { - n.with_name(COLLATOR) - .with_command("polkadot-parachain") - .with_image(images.cumulus.as_str()) - }) + p.with_id(1005) + .with_default_command("polkadot-parachain") + .with_default_image(images.cumulus.as_str()) + .with_chain_spec_command(CMD_TPL) + .chain_spec_command_is_local(true) + .with_chain("coretime-polkadot-local") + .with_collator(|n| n.with_name(COLLATOR)) }) .build() .map_err(|errs| { From 2fa37f7088159baa84438ef2b78335b106fb15a6 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 14:13:19 +0200 Subject: [PATCH 14/32] Again - add `-lparachain=debug"` --- .github/workflows/test.yml | 2 +- integration-tests/zombienet/src/lib.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aefa9c5345..2332652944 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -237,7 +237,7 @@ jobs: run: | export PATH=$(pwd)/target/debug:$PATH # WIP: TODO: temporary fix - export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 + # export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 2199ebc405..ca94c6bff3 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -17,6 +17,7 @@ pub fn small_network() -> Result { r.with_chain("polkadot-local") .with_default_command("polkadot") .with_default_image(images.polkadot.as_str()) + .with_default_args(vec!["-lparachain=debug".into()]) .with_chain_spec_command(CMD_TPL) .chain_spec_command_is_local(true) .with_node(|node| node.with_name(ALICE)) @@ -26,6 +27,7 @@ pub fn small_network() -> Result { p.with_id(1005) .with_default_command("polkadot-parachain") .with_default_image(images.cumulus.as_str()) + .with_default_args(vec!["-lparachain=debug".into()]) .with_chain_spec_command(CMD_TPL) .chain_spec_command_is_local(true) .with_chain("coretime-polkadot-local") From e9bbc70e1e9d0cc3939589ff4169087ae0908183 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 15:30:49 +0200 Subject: [PATCH 15/32] Add `zombienet=debug` back --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2332652944..b828386d8c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,6 +236,7 @@ jobs: timeout-minutes: 20 run: | export PATH=$(pwd)/target/debug:$PATH + export RUST_LOG=zombienet=debug # WIP: TODO: temporary fix # export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml From 843d25b2a9e01c8c59fbfb6452d27936060cf58c Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 23 Apr 2025 16:20:54 +0200 Subject: [PATCH 16/32] More logs --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b828386d8c..71afca8543 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,7 +236,7 @@ jobs: timeout-minutes: 20 run: | export PATH=$(pwd)/target/debug:$PATH - export RUST_LOG=zombienet=debug + export RUST_LOG=zombienet=debug,aura::cumulus=trace,relay-chain-rpc-client=trace,cumulus=trace # WIP: TODO: temporary fix # export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml From bca083ddcc3530b1edd2486dd406f907f45ddd65 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 24 Apr 2025 20:54:13 +0200 Subject: [PATCH 17/32] Update .github/workflows/test.yml --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 71afca8543..85cba24c7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,9 +236,6 @@ jobs: timeout-minutes: 20 run: | export PATH=$(pwd)/target/debug:$PATH - export RUST_LOG=zombienet=debug,aura::cumulus=trace,relay-chain-rpc-client=trace,cumulus=trace - # WIP: TODO: temporary fix - # export POLKADOT_IMAGE=docker.io/parity/polkadot:v1.17.4 cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From 7d1f99a7a481d4f1aa85f36dcd4877ead57dd5a1 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 24 Apr 2025 20:55:24 +0200 Subject: [PATCH 18/32] Apply suggestions from code review --- integration-tests/zombienet/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration-tests/zombienet/src/lib.rs b/integration-tests/zombienet/src/lib.rs index 912d85c5bc..59bc071e94 100644 --- a/integration-tests/zombienet/src/lib.rs +++ b/integration-tests/zombienet/src/lib.rs @@ -17,7 +17,6 @@ pub fn small_network() -> Result { r.with_chain("polkadot-local") .with_default_command("polkadot") .with_default_image(images.polkadot.as_str()) - .with_default_args(vec!["-lparachain=debug".into()]) .with_chain_spec_command(CMD_TPL) .with_default_args(vec!["-lparachain=debug,runtime=debug".into()]) .chain_spec_command_is_local(true) @@ -28,7 +27,6 @@ pub fn small_network() -> Result { p.with_id(1005) .with_default_command("polkadot-parachain") .with_default_image(images.cumulus.as_str()) - .with_default_args(vec!["-lparachain=debug".into()]) .with_chain_spec_command(CMD_TPL) .chain_spec_command_is_local(true) .with_chain("coretime-polkadot-local") From f304ad1c136b062cd3705a1e6224d25316fef4e4 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 25 Apr 2025 00:50:08 +0200 Subject: [PATCH 19/32] WIP: Attemp to run zombienet smoke as matrix --- .github/workflows/test.yml | 42 ++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85cba24c7f..3206b2fe4c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -192,15 +192,10 @@ jobs: RUSTFLAGS: "-C debug-assertions -D warnings" SKIP_WASM_BUILD: 1 - # Job required by "confirmTestPassed" - zombienet-smoke: + # Preparation for zombienet smoking + zombienet-smoke-setup: runs-on: ubuntu-latest steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0 - with: - access_token: ${{ github.token }} - - name: Checkout uses: actions/checkout@v4 @@ -223,19 +218,48 @@ jobs: shared-key: "fellowship-cache-zombienet-tests" save-if: ${{ github.ref == 'refs/heads/main' }} - - name: Build + - name: Build chain-spec-generator run: | cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --locked + # Job required by "confirmTestPassed" + zombienet-smoke: + needs: [zombienet-smoke-setup] + runs-on: ubuntu-latest + strategy: + matrix: + docker: + - polkadot: v1.17.4 + cumulus: v1.17.4 + can_fail: false + - polkadot: v1.17.4 + cumulus: v1.18.0 + can_fail: false + - polkadot: v1.18.0 + cumulus: v1.18.0 + can_fail: false + - polkadot: latest + cumulus: latest + can_fail: true + steps: + - name: Cancel previous runs + uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0 + with: + access_token: ${{ github.token }} + - name: Wait for Docker to Start run: | timeout 30 sh -c 'until docker info; do sleep 1; done' docker --version - - name: Zombienet smoke test + - name: Zombienet smoke test for polkadot-${{ matrix.docker.polkadot }} with polkadot-parachain-${{ matrix.docker.cumulus }}) timeout-minutes: 20 + continue-on-error: ${{ matrix.docker.can_fail }} run: | export PATH=$(pwd)/target/debug:$PATH + export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" + export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" + # TODO: possibly we could do a `cargo test --no-run` and reuse binary and save time cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From 0365d06582ddbd30b8e4b8ebf5ee6b744d71df4e Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 25 Apr 2025 00:50:17 +0200 Subject: [PATCH 20/32] Random typos --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3206b2fe4c..946bd67bd2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -266,7 +266,7 @@ jobs: needs: [ runtime-matrix ] runs-on: ubuntu-latest strategy: - # Ensure the other jobs are continue + # Ensure the other jobs are continued fail-fast: false matrix: runtime: ${{ fromJSON(needs.runtime-matrix.outputs.runtime) }} @@ -355,7 +355,7 @@ jobs: command: cd ecosystem-tests && yarn test # This will only run if all the tests in its "needs" array passed. - # Add this as your required job, becuase if the matrix changes size (new things get added) + # Add this as your required job, because if the matrix changes size (new things get added), # it will still require all the steps to succeed. # If you add more jobs, remember to add them to the "needs" array. confirmTestPassed: From 9a4cda51c7cd623244c5e3df9d67092647fd7324 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 25 Apr 2025 01:04:11 +0200 Subject: [PATCH 21/32] forgot upload/download --- .github/workflows/test.yml | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 946bd67bd2..da405fab7e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -222,6 +222,12 @@ jobs: run: | cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --locked + - name: Upload chain-spec-generator + uses: actions/upload-artifact@v4 + with: + name: chain-spec-generator-for-smoke + path: target/debug/chain-spec-generator + # Job required by "confirmTestPassed" zombienet-smoke: needs: [zombienet-smoke-setup] @@ -247,6 +253,34 @@ jobs: with: access_token: ${{ github.token }} + - name: Checkout + uses: actions/checkout@v4 + + - name: Install updates and dependencies + run: .github/install-deps.sh + + - name: Set rust version via common env file + run: cat .github/env >> $GITHUB_ENV + + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@master + with: + targets: "wasm32-unknown-unknown" + components: "rust-src" + toolchain: "${{env.RUST_STABLE_VERSION}}" + + - name: Fetch cache + uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 + with: + shared-key: "fellowship-cache-zombienet-tests" + save-if: ${{ github.ref == 'refs/heads/main' }} + + - name: Download binary + uses: actions/download-artifact@v4 + with: + name: chain-spec-generator-for-smoke + path: ./for-zombienet-smoke + - name: Wait for Docker to Start run: | timeout 30 sh -c 'until docker info; do sleep 1; done' @@ -256,7 +290,7 @@ jobs: timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | - export PATH=$(pwd)/target/debug:$PATH + export PATH=$(pwd)/for-zombienet-smoke:$PATH export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" # TODO: possibly we could do a `cargo test --no-run` and reuse binary and save time From 1e117c9f799c1e378c52627a03c674acffb03dad Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 25 Apr 2025 09:49:52 +0200 Subject: [PATCH 22/32] Update .github/workflows/test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da405fab7e..3dd1d8f95f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -290,6 +290,7 @@ jobs: timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | + chmod +x ./for-zombienet-smoke/chain-spec-generator export PATH=$(pwd)/for-zombienet-smoke:$PATH export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" From 13b328feca92966b349a0f9f4c938a23a9f7b377 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 25 Apr 2025 10:39:24 +0200 Subject: [PATCH 23/32] Update .github/workflows/test.yml --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3dd1d8f95f..34cca1fef2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -294,7 +294,6 @@ jobs: export PATH=$(pwd)/for-zombienet-smoke:$PATH export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" - # TODO: possibly we could do a `cargo test --no-run` and reuse binary and save time cargo test --manifest-path integration-tests/zombienet/Cargo.toml build-runtimes: From c821dab5307cfd937be02ff607297ce9de210f56 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Wed, 30 Apr 2025 17:14:55 +0200 Subject: [PATCH 24/32] WIP: log docker images --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34cca1fef2..6647059010 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -285,6 +285,8 @@ jobs: run: | timeout 30 sh -c 'until docker info; do sleep 1; done' docker --version + # WIP: + docker images - name: Zombienet smoke test for polkadot-${{ matrix.docker.polkadot }} with polkadot-parachain-${{ matrix.docker.cumulus }}) timeout-minutes: 20 @@ -295,6 +297,8 @@ jobs: export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" cargo test --manifest-path integration-tests/zombienet/Cargo.toml + # WIP: + docker images build-runtimes: needs: [ runtime-matrix ] From bd6d16b37014ca03a9dace2b9ae11e196a13ca90 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 11:29:54 +0200 Subject: [PATCH 25/32] Use native provider for zombienet smoke --- .github/workflows/test.yml | 75 ++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6647059010..831d71fa92 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -221,6 +221,7 @@ jobs: - name: Build chain-spec-generator run: | cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --locked + chmod +x target/debug/chain-spec-generator - name: Upload chain-spec-generator uses: actions/upload-artifact@v4 @@ -228,6 +229,28 @@ jobs: name: chain-spec-generator-for-smoke path: target/debug/chain-spec-generator + # Define supported Polkadot versions + - name: Download node binaries + shell: bash + run: | + # WIP: externalize + POLKADOT_VERSIONS=("polkadot-stable2412-5" "polkadot-stable2503") + NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") + PARACHAIN_BINARIES=("polkadot-parachain") + ALL_BINARIES=("${NODE_BINARIES[@]}" "${PARACHAIN_BINARIES[@]}") + for polkadot_version in "${POLKADOT_VERSIONS[@]}"; do + for binary in "${ALL_BINARIES[@]}"; do + curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$polkadot_version/${binary} -o ./node-binaries/${binary}-$polkadot_version + chmod +x ./${binary}-$polkadot_version + done + done + + - name: Upload node binaries to cache + uses: actions/upload-artifact@v4 + with: + name: node-binaries-for-smoke + path: node-binaries + # Job required by "confirmTestPassed" zombienet-smoke: needs: [zombienet-smoke-setup] @@ -235,18 +258,18 @@ jobs: strategy: matrix: docker: - - polkadot: v1.17.4 - cumulus: v1.17.4 + - polkadot: polkadot-stable2412-5 + cumulus: polkadot-stable2412-5 + can_fail: false + - polkadot: polkadot-stable2412-5 + cumulus: polkadot-stable2503 can_fail: false - - polkadot: v1.17.4 - cumulus: v1.18.0 + - polkadot: polkadot-stable2503 + cumulus: polkadot-stable2503 can_fail: false - - polkadot: v1.18.0 - cumulus: v1.18.0 + - polkadot: polkadot-stable2503 + cumulus: polkadot-stable2412-5 can_fail: false - - polkadot: latest - cumulus: latest - can_fail: true steps: - name: Cancel previous runs uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0 @@ -281,24 +304,36 @@ jobs: name: chain-spec-generator-for-smoke path: ./for-zombienet-smoke - - name: Wait for Docker to Start - run: | - timeout 30 sh -c 'until docker info; do sleep 1; done' - docker --version - # WIP: - docker images + - name: Download node binaries + uses: actions/download-artifact@v4 + with: + name: node-binaries-for-smoke + path: ./node-binaries - name: Zombienet smoke test for polkadot-${{ matrix.docker.polkadot }} with polkadot-parachain-${{ matrix.docker.cumulus }}) timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | - chmod +x ./for-zombienet-smoke/chain-spec-generator export PATH=$(pwd)/for-zombienet-smoke:$PATH - export POLKADOT_IMAGE="docker.io/parity/polkadot:${{ matrix.docker.polkadot }}" - export CUMULUS_IMAGE="docker.io/parity/polkadot-parachain:${{ matrix.docker.cumulus }}" + export PATH=$(pwd)/node-binaries:$PATH + + ls ./node-binaries + + # WIP: externalize + NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") + PARACHAIN_BINARIES=("polkadot-parachain") + + # Ensure matrix version for PATH + for binary in "${NODE_BINARIES[@]}"; do + cp ./node-binaries/${binary}-${{ matrix.docker.polkadot }} ./node-binaries/${binary} + done + for binary in "${PARACHAIN_BINARIES[@]}"; do + cp ./node-binaries/${binary}-${{ matrix.docker.cumulus }} ./node-binaries/${binary} + done + ls ./node-binaries + + export ZOMBIE_PROVIDER="Native" cargo test --manifest-path integration-tests/zombienet/Cargo.toml - # WIP: - docker images build-runtimes: needs: [ runtime-matrix ] From 6fce3a0776193db3492666e9ddc3df3eef8725b9 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 11:33:27 +0200 Subject: [PATCH 26/32] nit --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 831d71fa92..ea191bd4f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -317,7 +317,7 @@ jobs: export PATH=$(pwd)/for-zombienet-smoke:$PATH export PATH=$(pwd)/node-binaries:$PATH - ls ./node-binaries + ls -lrt ./node-binaries # WIP: externalize NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") @@ -330,7 +330,7 @@ jobs: for binary in "${PARACHAIN_BINARIES[@]}"; do cp ./node-binaries/${binary}-${{ matrix.docker.cumulus }} ./node-binaries/${binary} done - ls ./node-binaries + ls -lrt ./node-binaries export ZOMBIE_PROVIDER="Native" cargo test --manifest-path integration-tests/zombienet/Cargo.toml From d6fadf5473ef41a983d8c7896577cca610d6d61b Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 12:37:42 +0200 Subject: [PATCH 27/32] WIP --- .github/workflows/test.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea191bd4f9..1cdd14066b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -233,17 +233,25 @@ jobs: - name: Download node binaries shell: bash run: | - # WIP: externalize + echo "WIP: Starting" POLKADOT_VERSIONS=("polkadot-stable2412-5" "polkadot-stable2503") + echo "${POLKADOT_VERSIONS[@]}" NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") + echo "${NODE_BINARIES[@]}" PARACHAIN_BINARIES=("polkadot-parachain") + echo "${PARACHAIN_BINARIES[@]}" ALL_BINARIES=("${NODE_BINARIES[@]}" "${PARACHAIN_BINARIES[@]}") + echo "${ALL_BINARIES[@]}" + mkdir -p ./node-binaries for polkadot_version in "${POLKADOT_VERSIONS[@]}"; do + echo "Downloading for $polkadot_version" for binary in "${ALL_BINARIES[@]}"; do + echo "Downloading $binary" curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$polkadot_version/${binary} -o ./node-binaries/${binary}-$polkadot_version chmod +x ./${binary}-$polkadot_version done done + ls -lrt ./node-binaries - name: Upload node binaries to cache uses: actions/upload-artifact@v4 From fb50c754229cedece64c16a3995cb42f84df25a9 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 13:14:42 +0200 Subject: [PATCH 28/32] WIP: fix --- .github/workflows/test.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1cdd14066b..d8f3b35869 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -233,22 +233,16 @@ jobs: - name: Download node binaries shell: bash run: | - echo "WIP: Starting" POLKADOT_VERSIONS=("polkadot-stable2412-5" "polkadot-stable2503") - echo "${POLKADOT_VERSIONS[@]}" NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") - echo "${NODE_BINARIES[@]}" PARACHAIN_BINARIES=("polkadot-parachain") - echo "${PARACHAIN_BINARIES[@]}" ALL_BINARIES=("${NODE_BINARIES[@]}" "${PARACHAIN_BINARIES[@]}") - echo "${ALL_BINARIES[@]}" mkdir -p ./node-binaries for polkadot_version in "${POLKADOT_VERSIONS[@]}"; do - echo "Downloading for $polkadot_version" for binary in "${ALL_BINARIES[@]}"; do - echo "Downloading $binary" + echo "Downloading $binary for $polkadot_version" curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$polkadot_version/${binary} -o ./node-binaries/${binary}-$polkadot_version - chmod +x ./${binary}-$polkadot_version + chmod +x ./node-binaries/${binary}-$polkadot_version done done ls -lrt ./node-binaries From 128eea9c9f699a37102e24e504c8f8dffc95c5da Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 21:30:26 +0200 Subject: [PATCH 29/32] WIP: chmod +x --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8f3b35869..7d480bf49e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -221,7 +221,6 @@ jobs: - name: Build chain-spec-generator run: | cargo build -p chain-spec-generator --no-default-features --features fast-runtime,polkadot,coretime-polkadot --locked - chmod +x target/debug/chain-spec-generator - name: Upload chain-spec-generator uses: actions/upload-artifact@v4 @@ -316,21 +315,22 @@ jobs: timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | + # Add binaries to PATH export PATH=$(pwd)/for-zombienet-smoke:$PATH export PATH=$(pwd)/node-binaries:$PATH - ls -lrt ./node-binaries - + chmod +x ./for-zombienet-smoke/chain-spec-generator + # Ensure a matrix version for PATH # WIP: externalize NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") PARACHAIN_BINARIES=("polkadot-parachain") - - # Ensure matrix version for PATH for binary in "${NODE_BINARIES[@]}"; do cp ./node-binaries/${binary}-${{ matrix.docker.polkadot }} ./node-binaries/${binary} + chmod +x ./node-binaries/${binary} done for binary in "${PARACHAIN_BINARIES[@]}"; do cp ./node-binaries/${binary}-${{ matrix.docker.cumulus }} ./node-binaries/${binary} + chmod +x ./node-binaries/${binary} done ls -lrt ./node-binaries From fcac5e39dfe7168599a1dffa64e5ba01c9129561 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 1 May 2025 22:58:44 +0200 Subject: [PATCH 30/32] WIP: archtype? --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d480bf49e..39b454b524 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,6 +232,8 @@ jobs: - name: Download node binaries shell: bash run: | + # WIP: + uname -a POLKADOT_VERSIONS=("polkadot-stable2412-5" "polkadot-stable2503") NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") PARACHAIN_BINARIES=("polkadot-parachain") @@ -242,6 +244,7 @@ jobs: echo "Downloading $binary for $polkadot_version" curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$polkadot_version/${binary} -o ./node-binaries/${binary}-$polkadot_version chmod +x ./node-binaries/${binary}-$polkadot_version + file ./node-binaries/${binary}-$polkadot_version done done ls -lrt ./node-binaries @@ -315,6 +318,8 @@ jobs: timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | + # WIP: + uname -a # Add binaries to PATH export PATH=$(pwd)/for-zombienet-smoke:$PATH export PATH=$(pwd)/node-binaries:$PATH @@ -327,10 +332,12 @@ jobs: for binary in "${NODE_BINARIES[@]}"; do cp ./node-binaries/${binary}-${{ matrix.docker.polkadot }} ./node-binaries/${binary} chmod +x ./node-binaries/${binary} + file ./node-binaries/${binary} done for binary in "${PARACHAIN_BINARIES[@]}"; do cp ./node-binaries/${binary}-${{ matrix.docker.cumulus }} ./node-binaries/${binary} chmod +x ./node-binaries/${binary} + file ./node-binaries/${binary} done ls -lrt ./node-binaries From 547502d99409a3dec48e187cb7810826da491c3e Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Mon, 5 May 2025 11:27:17 +0200 Subject: [PATCH 31/32] polkadot-stable2412-5 does not contain binaries --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39b454b524..80db767464 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -234,7 +234,7 @@ jobs: run: | # WIP: uname -a - POLKADOT_VERSIONS=("polkadot-stable2412-5" "polkadot-stable2503") + POLKADOT_VERSIONS=("polkadot-stable2412-4" "polkadot-stable2503") NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") PARACHAIN_BINARIES=("polkadot-parachain") ALL_BINARIES=("${NODE_BINARIES[@]}" "${PARACHAIN_BINARIES[@]}") @@ -262,17 +262,17 @@ jobs: strategy: matrix: docker: - - polkadot: polkadot-stable2412-5 - cumulus: polkadot-stable2412-5 + - polkadot: polkadot-stable2412-4 + cumulus: polkadot-stable2412-4 can_fail: false - - polkadot: polkadot-stable2412-5 + - polkadot: polkadot-stable2412-4 cumulus: polkadot-stable2503 can_fail: false - polkadot: polkadot-stable2503 cumulus: polkadot-stable2503 can_fail: false - polkadot: polkadot-stable2503 - cumulus: polkadot-stable2412-5 + cumulus: polkadot-stable2412-4 can_fail: false steps: - name: Cancel previous runs From c044bcb4982018643506c2ee647c63bbf43d61e8 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Mon, 5 May 2025 15:18:55 +0200 Subject: [PATCH 32/32] WIP --- .github/workflows/test.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80db767464..13f16ce3a2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,8 +232,6 @@ jobs: - name: Download node binaries shell: bash run: | - # WIP: - uname -a POLKADOT_VERSIONS=("polkadot-stable2412-4" "polkadot-stable2503") NODE_BINARIES=("polkadot" "polkadot-execute-worker" "polkadot-prepare-worker") PARACHAIN_BINARIES=("polkadot-parachain") @@ -244,7 +242,6 @@ jobs: echo "Downloading $binary for $polkadot_version" curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$polkadot_version/${binary} -o ./node-binaries/${binary}-$polkadot_version chmod +x ./node-binaries/${binary}-$polkadot_version - file ./node-binaries/${binary}-$polkadot_version done done ls -lrt ./node-binaries @@ -318,8 +315,6 @@ jobs: timeout-minutes: 20 continue-on-error: ${{ matrix.docker.can_fail }} run: | - # WIP: - uname -a # Add binaries to PATH export PATH=$(pwd)/for-zombienet-smoke:$PATH export PATH=$(pwd)/node-binaries:$PATH