workbench: remove cardano-world "perf" usage/references

Also makes setenv-defaults usable from other parts of the workbench

Author: fmaste

Makefile

@@ -91,12 +91,14 @@ PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m fo
 PROFILES_CHAINSYNC        := chainsync-early-byron  chainsync-early-byron-notracer  chainsync-early-byron-oldtracing
 PROFILES_CHAINSYNC        += chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-oldtracing chainsync-early-alonzo-p2p
 PROFILES_VENDOR           := dish dish-plutus dish-10M dish-10M-plutus
-# "qa" and "perf" namespaces for cardano world (world.dev.cardano.org) Nomad
-# Not all local profiles are compatible (yet) with a cloud run
+# Cardano World (world.dev.cardano.org) Nomad cluster's "qa" class nodes
 # Cloud version of "default", "ci-test" and "ci-bench"
-PROFILES_CW_QA            := default-cw-qa ci-test-cw-qa ci-bench-cw-qa
-# The 52+explorer profile
-PROFILES_CW_PERF          := default-cw-perf ci-test-cw-perf ci-bench-cw-perf cw-perf-value
+# Not all local profiles are compatible or tested (yet) with a cloud runs
+PROFILES_NOMAD_CW_QA      := default-nomadcwqa ci-test-nomadcwqa ci-bench-nomadcwqa ci-test-nomadcwqa-mimicops
+# The dedicated P&T Nomad cluster on AWS
+# Cloud version of "default", "ci-test" and "ci-bench" plus value (52+explorer)
+# Not all local profiles are compatible or tested (yet) with a cloud runs
+PROFILES_NOMAD_PERF       := default-nomadperf ci-test-nomadperf ci-bench-nomadperf value-nomadperf
 
 LOCAL_PROFILES += $(PROFILES_BASE)
 LOCAL_PROFILES += $(PROFILES_FAST)
@@ -112,7 +114,7 @@ LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_PRE)
 LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_RTS)
 LOCAL_PROFILES += $(PROFILES_CHAINSYNC)
 LOCAL_PROFILES += $(PROFILES_VENDOR)
-CLOUD_PROFILES += $(PROFILES_CW_QA) $(PROFILES_CW_PERF)
+CLOUD_PROFILES += $(PROFILES_NOMAD_CW_QA) $(PROFILES_NOMAD_PERF)
 
 ## Note:  to enable a shell for a profile, just add its name (one of names from 'make ps') to SHELL_PROFILES
 

nix/workbench/backend/nomad-job.nix

@@ -273,12 +273,12 @@ let
         constraint = {
           attribute = "\${node.class}";
           operator = "=";
-          # For cloud benchmarking, dedicated static machines in the "perf"
-          # class are used. We mimic that for local/test runs.
+          # Cloud jobs can run in the dedicated P&T Nomad cluster on AWS or in
+          # Cardano World Nomad cluster's "qa" class nodes.
           # This default is just a precaution, like the top level namespace,
-          # because there are also available "qa" Class nodes but usage of these
-          # must be limited to short test and "infra" Class nodes are used for
-          # HA jobs and must be avoided entirely.
+          # because "qa" Class nodes usage must be limited to short test and
+          # "infra" Class nodes, that are used for HA jobs, must be avoided
+          # entirely.
           value = "perf";
         };
 
@@ -412,9 +412,9 @@ let
           };
 
           # Sensible defaults to run cloud version of "default", "ci-test" and
-          # "ci-bench" in cardano-world qa class Nomad nodes.
-          # For benchmarking dedicated static machines in the "perf" class are
-          # used and this value should be updated accordingly.
+          # "ci-bench" in Cardano World Nomad cluster's "qa" class nodes.
+          # For benchmarking the dedicated P&T Nomad cluster on AWS is used and
+          # this value should be updated accordingly.
           resources = {
             # Task can only ask for 'cpu' or 'cores' resource but not both.
             cores = 2;       # cpu = 512;
@@ -450,10 +450,10 @@ let
             # address of an AWS EC2 instance set this to
             # ${attr.unique.platform.aws.public-ipv4}.
             address =
-              # When using Cardano World (nomad.world.dev.cardano.org) "perf"
-              # class nodes we use public IPs/routing, all the other cloud runs
-              # are behind a VPC/firewall. Local runs just use 12.0.0.1.
-              if lib.strings.hasInfix "cw-perf" profileData.profileName
+              # When using the dedicated P&T Nomad cluster on AWS we use public
+              # IPs/routing, all the other cloud runs are behind a VPC/firewall.
+              # Local runs just use 12.0.0.1.
+              if lib.strings.hasInfix "-nomadperf" profileData.profileName
               then "\${attr.unique.platform.aws.public-ipv4}"
               else ""
             ;
@@ -1180,17 +1180,17 @@ let
         # Port string from
         ''--port ${toString nodeSpec.port}''
       ]
-      # On cloud deployments to SRE-managed Nomad, that uses AWS, the hosts at
-      # Linux level may not be aware of the EIP public address they have so we
-      # can't bind to the public IP (that we can resolve to using templates).
-      # The only options available are to bind to the "all-weather" 0.0.0.0 or
-      # use the private IP provided by AWS. We use the latter in case the Nomad
-      # Client was not started with the correct `-network-interface XX`
-      # parameter.
+      # On cloud deployments to SRE-managed / dedicated P&T Nomad cluster, that
+      # uses AWS, the hosts at Linux level may not be aware of the EIP public
+      # address they have so we can't bind to the public IP (that we can resolve
+      # to using templates). The only options available are to bind to the
+      # "all-weather" 0.0.0.0 or use the private IP provided by AWS. We use the
+      # latter in case the Nomad Client was not started with the correct
+      # `-network-interface XX` parameter.
       [
         # Address string to
         (
-          if lib.strings.hasInfix "cw-perf" profileData.profileName
+          if lib.strings.hasInfix "-nomadperf" profileData.profileName
           then ''--host-addr {{ env "attr.unique.platform.aws.local-ipv4" }}''
           else ''--host-addr 0.0.0.0''
         )