Skip to content

Commit 865b996

Browse files
authored
Merge pull request IntersectMBO#5481 from input-output-hk/bench-nomad-stop
workbench: nomad value profile
2 parents 2aa2d38 + f81cccb commit 865b996

20 files changed

+2717
-999
lines changed

Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m fo
9191
PROFILES_CHAINSYNC := chainsync-early-byron chainsync-early-byron-notracer chainsync-early-byron-oldtracing
9292
PROFILES_CHAINSYNC += chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-oldtracing chainsync-early-alonzo-p2p
9393
PROFILES_VENDOR := dish dish-plutus dish-10M dish-10M-plutus
94-
# "qa" and "perf" namespaces for cardano world (world.dev.cardano.org) Nomad
95-
# Not all local profiles are compatible (yet) with a cloud run
94+
# Cardano World (world.dev.cardano.org) Nomad cluster's "qa" class nodes
9695
# Cloud version of "default", "ci-test" and "ci-bench"
97-
PROFILES_CW_QA := default-cw-qa ci-test-cw-qa ci-bench-cw-qa
98-
# The 52+explorer profile
99-
PROFILES_CW_PERF := default-cw-perf ci-test-cw-perf ci-bench-cw-perf cw-perf-value
96+
# Not all local profiles are compatible or tested (yet) with a cloud runs
97+
PROFILES_NOMAD_CW_QA := default-nomadcwqa ci-test-nomadcwqa ci-bench-nomadcwqa oldtracing-nomadcwqa ci-test-oldtracing-nomadcwqa ci-bench-oldtracing-nomadcwqa
98+
# The dedicated P&T Nomad cluster on AWS
99+
# Cloud version of "default", "ci-test" and "ci-bench" plus value (52+explorer)
100+
# Not all local profiles are compatible or tested (yet) with a cloud runs
101+
PROFILES_NOMAD_PERF := default-nomadperf ci-test-nomadperf ci-bench-nomadperf value-nomadperf oldtracing-nomadperf ci-test-oldtracing-nomadperf ci-bench-oldtracing-nomadperf value-oldtracing-nomadperf
100102

101103
LOCAL_PROFILES += $(PROFILES_BASE)
102104
LOCAL_PROFILES += $(PROFILES_FAST)
@@ -112,7 +114,7 @@ LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_PRE)
112114
LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_RTS)
113115
LOCAL_PROFILES += $(PROFILES_CHAINSYNC)
114116
LOCAL_PROFILES += $(PROFILES_VENDOR)
115-
CLOUD_PROFILES += $(PROFILES_CW_QA) $(PROFILES_CW_PERF)
117+
CLOUD_PROFILES += $(PROFILES_NOMAD_CW_QA) $(PROFILES_NOMAD_PERF)
116118

117119
## Note: to enable a shell for a profile, just add its name (one of names from 'make ps') to SHELL_PROFILES
118120

nix/workbench/backend/nomad-job.nix

Lines changed: 109 additions & 87 deletions
Large diffs are not rendered by default.

nix/workbench/backend/nomad.sh

Lines changed: 641 additions & 389 deletions
Large diffs are not rendered by default.

nix/workbench/backend/nomad/cloud.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ let
2525

2626
validateNodeSpecs = { nodeSpecsValue }:
2727
let
28-
# SRE is using these 3 Nomad "datacenters" (how they are called in Nomad)
29-
datacenters = [ "eu-central-1" "us-east-2" "ap-southeast-2" ];
28+
# There's a region mismatch between the workbench (specifically Haskell
29+
# code in cardano-topology) and Cardano World's Nomad cluster that both
30+
# use "us-east-2" while our dedicated Nomad cluster is using "us-east-1",
31+
# what SRE deployed.
32+
# - Cardano World cluster: "eu-central-1", "us-east-2"
33+
# - Workbench (Nix level): "eu-central-1", "us-east-2", and "ap-southeast-2"
34+
# - Dedicated P&T cluster: "eu-central-1", "us-east-1", and "ap-southeast-2"
35+
datacenters = [ "eu-central-1" "us-east-1" "us-east-2" "ap-southeast-2" ];
3036
regions = lib.attrsets.mapAttrsToList
3137
(name: value: value.region)
3238
nodeSpecsValue

0 commit comments

Comments
 (0)