SQUASH

IntersectMBO · Nov 28, 2023 · f269aea · f269aea
1 parent 11d26de
commit f269aea
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 47 deletions.
diff --git a/bench/cardano-topology/data/ci-test-nomadcwqa.json b/bench/cardano-topology/data/ci-test-nomadcwqa.json
@@ -19,7 +19,7 @@
       "producers": [
         "node-0"
       ],
-      "region": "us-east-1",
+      "region": "us-east-2",
       "stakePool": true
     }
   ],

diff --git a/bench/cardano-topology/data/default-nomadcwqa.json b/bench/cardano-topology/data/default-nomadcwqa.json
@@ -49,7 +49,7 @@
         "node-3",
         "node-5"
       ],
-      "region": "us-east-1",
+      "region": "us-east-2",
       "stakePool": true
     },
     {
@@ -62,7 +62,7 @@
         "node-5",
         "node-1"
       ],
-      "region": "us-east-1",
+      "region": "us-east-2",
       "stakePool": true
     },
     {
@@ -75,7 +75,7 @@
         "node-1",
         "node-3"
       ],
-      "region": "us-east-1",
+      "region": "us-east-2",
       "stakePool": true
     }
   ],

diff --git a/bench/cardano-topology/test/Main.hs b/bench/cardano-topology/test/Main.hs
@@ -81,7 +81,7 @@ topology = Tasty.testGroup
                                         2
                                         [
                                                   (Types.AWS Types.EU_CENTRAL_1)
-                                                , (Types.AWS Types.US_EAST_1)
+                                                , (Types.AWS Types.US_EAST_2)
                                         ]
                                         (\_ -> Just 1)
                                 )
@@ -132,7 +132,7 @@ topology = Tasty.testGroup
                                         6
                                         [
                                                   (Types.AWS Types.EU_CENTRAL_1)
-                                                , (Types.AWS Types.US_EAST_1)
+                                                , (Types.AWS Types.US_EAST_2)
                                         ]
                                         (\_ -> Just 1)
                                 )

diff --git a/nix/workbench/backend/nomad-job.nix b/nix/workbench/backend/nomad-job.nix
@@ -197,8 +197,10 @@ let
 
     #  A list of datacenters in the region which are eligible for task
     # placement. This must be provided, and does not have a default.
-    # SRE: Only 3 Nomad datacenters exist actually.
-    datacenters = [ "eu-central-1" "us-east-2" "ap-southeast-2" ];
+    # What we currently have available:
+    # - Cardano World cluster: "eu-central-1", "us-east-2"
+    # - Dedicated P&T cluster: "eu-central-1", "us-east-1", and "ap-southeast-2"
+    datacenters = [ "ap-southeast-2" "eu-central-1" "us-east-1" "us-east-2" ];
 
     # Specifies user-defined constraints on the task. This can be provided
     # multiple times to define additional constraints.

diff --git a/nix/workbench/backend/nomad/cloud.sh b/nix/workbench/backend/nomad/cloud.sh
@@ -412,44 +412,6 @@ allocate-run-nomadcloud() {
   then
     fatal "Envar \"WB_SHELL_PROFILE\" is empty!"
   else
-    ########################################################################
-    # Fix for region mismatches ############################################
-    ########################################################################
-    # If value profile, "value-nomadperf", topology was imported from
-    # cardano-ops / nixops that was already using "us-east-1", but not
-    # "default-nomadperf", "ci-test-nomadperf" and "ci-bench" that is generated
-    # by `cardano-topology` (Haskell project in bench/).
-    # - Cardano World cluster: "eu-central-1", "us-east-2"
-    # - Workbench (Nix level): "eu-central-1", "us-east-2", and "ap-southeast-2"
-    # - Dedicated P&T cluster: "eu-central-1", "us-east-1", and "ap-southeast-2"
-    if echo "${WB_SHELL_PROFILE}" | grep --quiet "\-nomadperf"
-    then
-        jq \
-          "                                                         \
-              .[\"job\"][\"${nomad_job_name}\"][\"datacenters\"]    \
-            |=                                                      \
-              [\"eu-central-1\", \"us-east-1\", \"ap-southeast-2\"] \
-          " \
-          "${dir}"/nomad/nomad-job.json \
-      | \
-        sponge "${dir}"/nomad/nomad-job.json
-      # Nix creates a Nomad Job file with affinities taken from node-specs.json
-        jq \
-          "                                                  \
-               .[\"job\"][\"${nomad_job_name}\"][\"group\"]  \
-            |= with_entries(                                 \
-                 if (.value.affinity.value == \"us-east-2\") \
-                 then                                        \
-                   (.value.affinity.value |= \"us-east-1\")  \
-                 else                                        \
-                   (.)                                       \
-                 end                                         \
-               )                                             \
-          " \
-          "${dir}"/nomad/nomad-job.json \
-      | \
-        sponge "${dir}"/nomad/nomad-job.json
-    fi
     ############################################################################
     # Unique placement: ########################################################
     ############################################################################

diff --git a/nix/workbench/profile/prof1-variants.jq b/nix/workbench/profile/prof1-variants.jq
@@ -171,7 +171,7 @@ def all_profile_variants:
   |
     # "qa" class Nodes of Cardano World Nomad cluster
     { composition:
-      { locations:                      ["eu-central-1", "us-east-1"]
+      { locations:                      ["eu-central-1", "us-east-2"]
       , topology:                       "torus"
       , with_explorer:                  true
       }