Skip to content

Commit

Permalink
[forge] exclude new pipeline for compat test (#15644)
Browse files Browse the repository at this point in the history
  • Loading branch information
ibalajiarun authored Dec 20, 2024
1 parent 2bea962 commit 8a0f983
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions testsuite/forge-cli/src/suites/land_blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
15 changes: 11 additions & 4 deletions testsuite/forge/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down Expand Up @@ -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();
}
}))
}

Expand Down

0 comments on commit 8a0f983

Please sign in to comment.