From 42d79f567ed434f49a871947300c799333f235fb Mon Sep 17 00:00:00 2001 From: Federico Mastellone Date: Tue, 19 Nov 2024 17:26:10 +0000 Subject: [PATCH] SQUASH --- nix/workbench/service/generator.nix | 14 +++++++++++--- nix/workbench/service/healthcheck.nix | 10 +++++++++- wb_profiles.mk | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/nix/workbench/service/generator.nix b/nix/workbench/service/generator.nix index 7e6812639e3..70bd6700b18 100644 --- a/nix/workbench/service/generator.nix +++ b/nix/workbench/service/generator.nix @@ -132,9 +132,17 @@ let ############################### VOTING ############################### ############################### VOTING ############################### ############################### VOTING ############################### - ${import ./voting.nix {inherit pkgs profile nodeSpecs;}} - workflow_generator \ - ${if profile.composition.with_explorer then "explorer" else "node-0"} + ${if profile.generator.drep_voting or false + then + '' + ${import ./voting.nix {inherit pkgs profile nodeSpecs;}} + workflow_generator \ + ${if profile.composition.with_explorer then "explorer" else "node-0"} + '' + else + '' + '' + } ############################### VOTING ############################### ############################### VOTING ############################### ############################### VOTING ############################### diff --git a/nix/workbench/service/healthcheck.nix b/nix/workbench/service/healthcheck.nix index cc34eb99d49..2875fa337bd 100644 --- a/nix/workbench/service/healthcheck.nix +++ b/nix/workbench/service/healthcheck.nix @@ -958,7 +958,15 @@ let # Conway/governance functions! ####################################### ###################################################################### - ${import ./voting.nix {inherit pkgs profile nodeSpecs;}} + ${if profile.generator.drep_voting or false + then + '' + ${import ./voting.nix {inherit pkgs profile nodeSpecs;}} + '' + else + '' + '' + } if test -n "''${NOMAD_DEBUG:-}" then diff --git a/wb_profiles.mk b/wb_profiles.mk index 9fe79bcac97..2b47878d9e1 100644 --- a/wb_profiles.mk +++ b/wb_profiles.mk @@ -7,7 +7,7 @@ PROFILES_K3 := k3-3ep-5kTx-10000kU-1300kD-64kbs-fixed-loaded k3-3ep-9kTx-10000kU PROFILES_SCENARIOS := chainsync-early-byron chainsync-early-byron-notracer chainsync-early-byron-oldtracing chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-p2p chainsync-early-alonzo-oldtracing devops idle latency-nomadperf latency-nomadperfssd tracer-only PROFILES_LEGACY := ci-test-dense10 dish dish-10M dish-plutus dish-10M-plutus PROFILES_SCALING := faststartup-24M -PROFILES_NOMAD_PERF := value-nomadperf value-nomadperf-nop2p value-drep1k-nomadperf value-drep2k-nomadperf value-drep10k-nomadperf value-drep100k-nomadperf value-oldtracing-nomadperf value-oldtracing-nomadperf-nop2p value-volt-nomadperf plutus-nomadperf plutus-nomadperf-nop2p plutus-drep1k-nomadperf plutus-drep2k-nomadperf plutus-drep10k-nomadperf plutus-drep100k-nomadperf plutus24-nomadperf plutus-secp-ecdsa-nomadperf plutus-secp-schnorr-nomadperf plutusv3-blst-nomadperf plutusv3-blst-double-nomadperf plutusv3-blst-half-nomadperf plutus-volt-nomadperf fast-nomadperf fast-nomadperf-nop2p ci-test-nomadperf ci-test-nomadperf-nop2p ci-test-oldtracing-nomadperf default-nomadperf-nop2p default-nomadperf oldtracing-nomadperf oldtracing-nomadperf-nop2p ci-bench-nomadperf ci-bench-nomadperf-nop2p ci-bench-oldtracing-nomadperf +PROFILES_NOMAD_PERF := value-nomadperf value-nomadperf-nop2p value-drep1k-nomadperf value-drep2k-nomadperf value-drep10k-nomadperf value-drep100k-nomadperf value-oldtracing-nomadperf value-oldtracing-nomadperf-nop2p value-volt-nomadperf plutus-nomadperf plutus-nomadperf-nop2p plutus-drep1k-nomadperf plutus-drep2k-nomadperf plutus-drep10k-nomadperf plutus-drep100k-nomadperf plutus24-nomadperf plutus-secp-ecdsa-nomadperf plutus-secp-schnorr-nomadperf plutusv3-blst-nomadperf plutusv3-blst-double-nomadperf plutusv3-blst-half-nomadperf plutus-volt-nomadperf fast-nomadperf fast-nomadperf-nop2p ci-test-nomadperf ci-test-nomadperf-nop2p ci-test-oldtracing-nomadperf default-nomadperf-nop2p default-nomadperf oldtracing-nomadperf oldtracing-nomadperf-nop2p ci-bench-nomadperf ci-bench-nomadperf-nop2p ci-bench-oldtracing-nomadperf value-voting-volt-nomadperf PROFILES_NOMAD_PERFSSD := utxoscale-solo-12M16G-nomadperfssd utxoscale-solo-12M64G-nomadperfssd utxoscale-solo-24M64G-nomadperfssd fast-nomadperfssd value-nomadperfssd LOCAL_PROFILES += $(PROFILES_EMPTY)