wb | small changes

IntersectMBO · May 8, 2024 · ab9dc54 · ab9dc54
1 parent bfdf084
commit ab9dc54
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -84,8 +84,8 @@ PROFILES_EPOCHTRANS       := epoch-transition
 PROFILES_PLUTUSCALL       := plutuscall-loop-plain plutuscall-secp-ecdsa-plain plutuscall-secp-schnorr-plain
 PROFILES_PLUTUSCALL       += plutuscall-loop-half plutuscall-secp-ecdsa-half plutuscall-secp-schnorr-half
 PROFILES_PLUTUSCALL       += plutuscall-loop-double plutuscall-secp-ecdsa-double plutuscall-secp-schnorr-double
-PROFILES_MODEL		        := model-value model-secp-ecdsa-plain model-secp-ecdsa-half model-secp-ecdsa-double
-PROFILES_MODEL		       	+= model-value-test
+PROFILES_MODEL            := model-value model-secp-ecdsa-plain model-secp-ecdsa-half model-secp-ecdsa-double
+PROFILES_MODEL            += model-value-test
 PROFILES_10               := 10 10-p2p 10-plutus 10-notracer
 PROFILES_FORGE_STRESS     := forge-stress forge-stress-p2p forge-stress-plutus forge-stress-plutus-solo forge-stress-notracer forge-stress-large forge-stress-solo forge-stress-solo-xs
 PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stress-pre-notracer forge-stress-pre-solo forge-stress-pre-solo-xl forge-stress-pre-solo-xs

diff --git a/nix/workbench/backend/nomad/cloud.sh b/nix/workbench/backend/nomad/cloud.sh
@@ -19,6 +19,7 @@ backend_nomadcloud() {
 
     # Overrided backend "methods"
 
+    # All sub-backends set these same jq envars.
     setenv-defaults )
       local usage="USAGE: wb backend $op BACKEND-DIR"
       local backend_dir=${1:?$usage}; shift
@@ -190,9 +191,7 @@ backend_nomadcloud() {
 
 }
 
-# Sets jq envars ("profile_container_specs_file" ,"nomad_environment",
-# "nomad_task_driver" and "one_tracer_per_node") and checks Nomad envars
-# (NOMAD_ADDR, NOMAD_NAMESPACE, NOMAD_TOKEN).
+# Sets the envars not shared by all the other sub-backends.
 setenv-defaults-nomadcloud() {
   local backend_dir="${1}"
 
@@ -683,9 +682,19 @@ allocate-run-nomadcloud() {
           # changes something related to Nomad Clients or AWS instances we
           # may hopefully notice it when the job fails to start (placement
           # errors).
-          msg "$(blue "INFO:") Nomad Task $(yellow "\"${task_name}\"") will be constrainted to $(yellow "AWS Instance ID \"${instance_id}\" with AZ \"${availability_zone}\"") that is currently running $(yellow "Nomad node \"${node_name}\" (${node_id})")"
+          msg "$(blue "INFO:") Nomad Task $(yellow "\"${task_name}\"") will be constrainted to $(yellow "AWS Instance ID \"${instance_id}\" with AZ \"${availability_zone}\"") running $(yellow "Nomad node \"${node_name}\" (${node_id})")"
           local group_constraints_array_plus="
             [ \
+                { \
+                  \"attribute\": \"\${node.unique.id}\" \
+                , \"value\":     \"${node_id}\" \
+                } \
+              ,
+                { \
+                  \"attribute\": \"\${node.unique.name}\" \
+                , \"value\":     \"${node_name}\" \
+                } \
+              ,
                 { \
                   \"attribute\": \"\${attr.platform.aws.instance-type}\" \
                 , \"value\":     \"${instance_type}\" \
@@ -856,7 +865,7 @@ check-deployment() {
   then
     echo "${node_specs_ante}" > "${dir}"/node-specs.ante.json
     echo "${node_specs_post}" > "${dir}"/node-specs.post.json
-    diff --side-by-side "${dir}"/node-specs.ante.json "${dir}"/node-specs.post.json
+    dyff between "${dir}"/node-specs.ante.json "${dir}"/node-specs.post.json
     msg "$(red "----------")"
     msg "$(red "REQUESTED AND DEPLOYED node-specs.json DO NOT MATCH")"
     msg "$(red "----------")"
@@ -877,7 +886,7 @@ check-deployment() {
   then
     echo "${topology_ante}" > "${dir}"/topology.ante.json
     echo "${topology_post}" > "${dir}"/topology.post.json
-    diff --side-by-side "${dir}"/topology.ante.json "${dir}"/topology.post.json
+    dyff between "${dir}"/topology.ante.json "${dir}"/topology.post.json
     msg "$(red "----------")"
     msg "$(red "REQUESTED AND DEPLOYED topology.json DO NOT MATCH")"
     msg "$(red "----------")"

diff --git a/nix/workbench/backend/nomad/exec.sh b/nix/workbench/backend/nomad/exec.sh
@@ -19,6 +19,7 @@ backend_nomadexec() {
 
     # Overrided backend "methods"
 
+    # All sub-backends set these same jq envars.
     setenv-defaults )
       local usage="USAGE: wb backend $op BACKEND-DIR"
       local backend_dir=${1:?$usage}; shift
@@ -156,8 +157,7 @@ backend_nomadexec() {
 
 }
 
-# Sets jq envars "profile_container_specs_file" ,"nomad_environment",
-# "nomad_task_driver" and "one_tracer_per_node".
+# Sets the envars not shared by all the other sub-backends.
 setenv-defaults-nomadexec() {
   local backend_dir="${1}"
 

diff --git a/nix/workbench/backend/nomad/podman.sh b/nix/workbench/backend/nomad/podman.sh
@@ -19,6 +19,7 @@ backend_nomadpodman() {
 
     # Overrided backend "methods"
 
+    # All sub-backends set these same jq envars.
     setenv-defaults )
       local usage="USAGE: wb backend $op BACKEND-DIR"
       local backend_dir=${1:?$usage}; shift
@@ -156,9 +157,7 @@ backend_nomadpodman() {
 
 }
 
-# Sets jq envars "profile_container_specs_file" ,"nomad_environment",
-# "nomad_task_driver" and "one_tracer_per_node".
-# It "overrides" completely `backend_nomad`'s `setenv-defaults`.
+# Sets the envars not shared by all the other sub-backends.
 setenv-defaults-nomadpodman() {
   local backend_dir="${1}"