Added substrate validators warp sync test

Author: DenzelPenzel

.github/zombienet-tests/zombienet_substrate_tests.yml

@@ -4,27 +4,17 @@
   use-zombienet-sdk: true
 
 - job-name: "zombienet-substrate-0001-basic-warp-sync"
-  test-definition: "test-warp-sync.zndsl"
-  local-dir: "./substrate/zombienet/0001-basic-warp-sync"
+  test-filter: "zombie_ci::basic_warp_sync::basic_warp_sync"
   runner-type: "default"
-  concurrency: 4
-  use-zombienet-sdk: false
+  use-zombienet-sdk: true
 
 # TODO: Disabled, fails 1 in 50 runs
 - job-name: "zombienet-substrate-0002-validators-warp-sync"
-  test-definition: "test-validators-warp-sync.zndsl"
-  local-dir: "./substrate/zombienet/0002-validators-warp-sync"
+  test-filter: "zombie_ci::validators_warp_sync::validators_warp_sync"
   runner-type: "default"
-  concurrency: 4
-  use-zombienet-sdk: false
-  additional-setup: |
-    cp --remove-destination ./substrate/zombienet/0001-basic-warp-sync/chain-spec.json ./substrate/zombienet/0002-validators-warp-sync
+  use-zombienet-sdk: true
 
 - job-name: "zombienet-substrate-0003-block-building-warp-sync"
-  test-definition: "test-block-building-warp-sync.zndsl"
-  local-dir: "./substrate/zombienet/0003-block-building-warp-sync"
+  test-filter: "zombie_ci::block_building_warp_sync::block_building_warp_sync"
   runner-type: "default"
-  concurrency: 4
-  use-zombienet-sdk: false
-  additional-setup: |
-    cp --remove-destination ./substrate/zombienet/0001-basic-warp-sync/chain-spec.json ./substrate/zombienet/0003-block-building-warp-sync
+  use-zombienet-sdk: true

substrate/zombienet/zombienet-sdk/tests/utils.rs

@@ -4,6 +4,8 @@
 use zombienet_sdk::{LocalFileSystem, Network, NetworkConfig};
 
 pub const BEST_BLOCK_METRIC: &str = "block_height{status=\"best\"}";
+pub const FINALIZED_BLOCK_METRIC: &str = "substrate_block_height{status=\"finalized\"}";
+pub const BEEFY_BEST_BLOCK_METRIC: &str = "substrate_beefy_best_block";
 pub const DEFAULT_SUBSTRATE_IMAGE: &str = "docker.io/paritypr/substrate:latest";
 
 pub const DEFAULT_DB_SNAPSHOT_URL: &str =

substrate/zombienet/zombienet-sdk/tests/zombie_ci/basic_warp_sync.rs

@@ -3,7 +3,9 @@
 
 use std::time::Duration;
 
-use crate::utils::{initialize_network, BEST_BLOCK_METRIC};
+use crate::utils::{
+	initialize_network, BEST_BLOCK_METRIC, DEFAULT_CHAIN_SPEC, DEFAULT_DB_SNAPSHOT_URL,
+};
 use anyhow::{anyhow, Result};
 use env_logger::Env;
 use zombienet_orchestrator::network::node::LogLineCountOptions;
@@ -29,10 +31,6 @@ const DB_SNAPSHOT_ENV: &str = "DB_SNAPSHOT";
 const CHAIN_SPEC_ENV: &str = "WARP_CHAIN_SPEC_PATH";
 const DB_BLOCK_HEIGHT_ENV: &str = "DB_BLOCK_HEIGHT";
 const DEFAULT_SUBSTRATE_IMAGE: &str = "docker.io/paritypr/substrate:latest";
-const DEFAULT_DB_SNAPSHOT_URL: &str =
-	"https://storage.googleapis.com/zombienet-db-snaps/substrate/0001-basic-warp-sync/chains-0bb3f0be2ce41b5615b224215bcc8363aa0416a6.tgz";
-const DEFAULT_CHAIN_SPEC: &str =
-	"https://raw.githubusercontent.com/paritytech/polkadot-sdk/refs/heads/master/substrate/zombienet/0001-basic-warp-sync/chain-spec.json";
 
 #[tokio::test(flavor = "multi_thread")]
 async fn basic_warp_sync() -> Result<()> {
@@ -88,6 +86,9 @@ async fn basic_warp_sync() -> Result<()> {
 }
 
 fn ensure_env_defaults() {
+	if std::env::var(INTEGRATION_IMAGE_ENV).is_err() {
+		std::env::set_var(INTEGRATION_IMAGE_ENV, DEFAULT_SUBSTRATE_IMAGE);
+	}
 	if std::env::var(DB_SNAPSHOT_ENV).is_err() {
 		std::env::set_var(DB_SNAPSHOT_ENV, DEFAULT_DB_SNAPSHOT_URL);
 	}
@@ -115,6 +116,8 @@ async fn resolve_db_snapshot_height(
 }
 
 fn build_network_config() -> Result<NetworkConfig> {
+	let integration_image = std::env::var(INTEGRATION_IMAGE_ENV)
+		.unwrap_or_else(|_| DEFAULT_SUBSTRATE_IMAGE.to_string());
 	let db_snapshot =
 		std::env::var(DB_SNAPSHOT_ENV).map_err(|_| anyhow!("db snapshot env var not set"))?;
 	let chain_spec =
@@ -125,7 +128,7 @@ fn build_network_config() -> Result<NetworkConfig> {
 			relaychain
 				.with_chain("local")
 				.with_default_command("substrate")
-				.with_default_image(DEFAULT_SUBSTRATE_IMAGE)
+				.with_default_image(integration_image.as_str())
 				.with_chain_spec_path(chain_spec.as_str())
 				.with_node(|node| {
 					node.with_name("alice").validator(false).with_db_snapshot(db_snapshot.as_str())

substrate/zombienet/zombienet-sdk/tests/zombie_ci/block_building.rs

@@ -3,14 +3,12 @@
 
 use std::time::Duration;
 
-use crate::utils::initialize_network;
+use crate::utils::{initialize_network, DEFAULT_CHAIN_SPEC, DEFAULT_SUBSTRATE_IMAGE};
 use anyhow::{anyhow, Result};
 use subxt::{config::substrate::SubstrateConfig, dynamic::tx, OnlineClient};
 use subxt_signer::sr25519::dev;
 use zombienet_orchestrator::network::node::LogLineCountOptions;
-use zombienet_sdk::{environment::get_spawn_fn, NetworkConfig, NetworkConfigBuilder, NetworkNode};
-
-const DEFAULT_SUBSTRATE_IMAGE: &str = "docker.io/paritypr/substrate:latest";
+use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder, NetworkNode};
 
 const NODE_NAMES: [&str; 2] = ["alice", "bob"];
 
@@ -28,13 +26,17 @@ const LOG_TIMEOUT_SECS: u64 = 2;
 const SCRIPT_TIMEOUT_SECS: u64 = 30;
 
 const REMARK_PAYLOAD: &[u8] = b"block-building-test";
+const INTEGRATION_IMAGE_ENV: &str = "ZOMBIENET_INTEGRATION_TEST_IMAGE";
+const CHAIN_SPEC_ENV: &str = "WARP_CHAIN_SPEC_PATH";
 
 #[tokio::test(flavor = "multi_thread")]
 async fn block_building_test() -> Result<()> {
 	let _ = env_logger::try_init_from_env(
 		env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
 	);
 
+	ensure_env_defaults();
+
 	log::info!("Spawning network");
 	let config = build_network_config()?;
 	let network = initialize_network(config).await?;
@@ -54,13 +56,28 @@ async fn block_building_test() -> Result<()> {
 	Ok(())
 }
 
+fn ensure_env_defaults() {
+	if std::env::var(INTEGRATION_IMAGE_ENV).is_err() {
+		std::env::set_var(INTEGRATION_IMAGE_ENV, DEFAULT_SUBSTRATE_IMAGE);
+	}
+	if std::env::var(CHAIN_SPEC_ENV).is_err() {
+		std::env::set_var(CHAIN_SPEC_ENV, DEFAULT_CHAIN_SPEC);
+	}
+}
+
 fn build_network_config() -> Result<NetworkConfig> {
+	let integration_image = std::env::var(INTEGRATION_IMAGE_ENV)
+		.unwrap_or_else(|_| DEFAULT_SUBSTRATE_IMAGE.to_string());
+	let chain_spec =
+		std::env::var(CHAIN_SPEC_ENV).unwrap_or_else(|_| DEFAULT_CHAIN_SPEC.to_string());
+
 	let config = NetworkConfigBuilder::new()
 		.with_relaychain(|relaychain| {
 			relaychain
 				.with_chain("local")
 				.with_default_command("substrate")
-				.with_default_image(DEFAULT_SUBSTRATE_IMAGE)
+				.with_default_image(integration_image.as_str())
+				.with_chain_spec_path(chain_spec.as_str())
 				.with_default_args(vec!["-lparachain=debug".into()])
 				.with_node(|node| node.with_name("alice"))
 				.with_node(|node| node.with_name("bob"))