From 8a0f983a09c9cd900a3b2e7115b8e35f86d6675d Mon Sep 17 00:00:00 2001 From: Balaji Arun Date: Fri, 20 Dec 2024 11:03:16 -0800 Subject: [PATCH] [forge] exclude new pipeline for compat test (#15644) --- testsuite/forge-cli/src/suites/land_blocking.rs | 1 + testsuite/forge/src/config.rs | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/testsuite/forge-cli/src/suites/land_blocking.rs b/testsuite/forge-cli/src/suites/land_blocking.rs index dbae2019a9a43..5b2a2eafbe456 100644 --- a/testsuite/forge-cli/src/suites/land_blocking.rs +++ b/testsuite/forge-cli/src/suites/land_blocking.rs @@ -29,6 +29,7 @@ pub(crate) fn get_land_blocking_test( pub(crate) fn compat() -> ForgeConfig { ForgeConfig::default() + .with_suite_name("compat".into()) .with_initial_validator_count(NonZeroUsize::new(4).unwrap()) .add_network_test(SimpleValidatorUpgrade) .with_success_criteria(SuccessCriteria::new(5000).add_wait_for_catchup_s(240)) diff --git a/testsuite/forge/src/config.rs b/testsuite/forge/src/config.rs index 599cfad0a411b..61584befb8752 100644 --- a/testsuite/forge/src/config.rs +++ b/testsuite/forge/src/config.rs @@ -170,6 +170,7 @@ impl ForgeConfig { let existing_db_tag = self.existing_db_tag.clone(); let validator_resource_override = self.validator_resource_override; let fullnode_resource_override = self.fullnode_resource_override; + let suite_name = self.get_suite_name(); // Override specific helm values. See reference: terraform/helm/aptos-node/values.yaml Some(Arc::new(move |helm_values: &mut serde_yaml::Value| { @@ -239,10 +240,16 @@ impl ForgeConfig { helm_values["validator"]["config"]["indexer_db_config"]["enable_event"] = true.into(); helm_values["fullnode"]["config"]["indexer_db_config"]["enable_event"] = true.into(); - // enable new pipeline - helm_values["validator"]["config"]["consensus"]["enable_pipeline"] = true.into(); - helm_values["fullnode"]["config"]["consensus_observer"]["enable_pipeline"] = - true.into(); + // This is a temporary hack to disable new pipeline for compat tests. + if !suite_name + .as_ref() + .is_some_and(|name| name.eq_ignore_ascii_case("compat")) + { + // enable new pipeline + helm_values["validator"]["config"]["consensus"]["enable_pipeline"] = true.into(); + helm_values["fullnode"]["config"]["consensus_observer"]["enable_pipeline"] = + true.into(); + } })) }