services/nomad/build/buildbot{,-worker}: partially revert changes for a-sea-us

keep builders where they are for now while we solve a-sea-us instability

Author: classabbyamp

services/nomad/build/buildbot-worker.nomad

@@ -9,8 +9,8 @@ job "buildbot-worker" {
       // memory is ~90% of capacity
       // memory_max is ~95% of capacity
       { name = "glibc",   jobs = 10, cpu = 38100, mem = 115840, mem_max = 122270 },
-      { name = "musl",    jobs = 6,  cpu = 12000, mem = 28500,  mem_max = 30500  },
-      { name = "aarch64", jobs = 12, cpu = 16000, mem = 27500,  mem_max = 29500  },
+      { name = "musl",    jobs = 6,  cpu = 21700, mem = 57690,  mem_max = 60890  },
+      { name = "aarch64", jobs = 6,  cpu = 12000, mem = 28500,  mem_max = 30500  },
     ]
     labels = [ "buildbot-worker-${group.value.name}" ]
 
@@ -171,6 +171,16 @@ repository=http://{{ .Address }}:{{ .Port }}/nonfree
 repository=http://{{ .Address }}:{{ .Port }}/multilib/bootstrap
 repository=http://{{ .Address }}:{{ .Port }}/multilib
 repository=http://{{ .Address }}:{{ .Port }}/multilib/nonfree
+{{ else if eq "${group.value.name}" "aarch64" }}
+repository=http://{{ .Address }}:{{ .Port }}/bootstrap
+repository=http://{{ .Address }}:{{ .Port }}
+repository=http://{{ .Address }}:{{ .Port }}/nonfree
+repository=http://{{ .Address }}:{{ .Port }}/musl/bootstrap
+repository=http://{{ .Address }}:{{ .Port }}/musl
+repository=http://{{ .Address }}:{{ .Port }}/musl/nonfree
+repository=http://{{ .Address }}:{{ .Port }}/aarch64/bootstrap
+repository=http://{{ .Address }}:{{ .Port }}/aarch64
+repository=http://{{ .Address }}:{{ .Port }}/aarch64/nonfree
 {{ else }}
 repository=http://{{ .Address }}:{{ .Port }}/${group.value.name}/bootstrap
 repository=http://{{ .Address }}:{{ .Port }}/${group.value.name}

services/nomad/build/buildbot.nomad

@@ -114,8 +114,8 @@ EOF
             { name = "x86_64-musl",  host = "x86_64-musl",                          worker = "musl",   },
             { name = "armv7l-musl",  host = "x86_64-musl", target = "armv7l-musl",  worker = "musl",   },
             { name = "armv6l-musl",  host = "x86_64-musl", target = "armv6l-musl",  worker = "musl",   },
-            { name = "aarch64",      host = "aarch64",                              worker = "aarch64" },
-            { name = "aarch64-musl", host = "aarch64-musl",                         worker = "aarch64" },
+            { name = "aarch64",      host = "x86_64",      target = "aarch64",      worker = "aarch64" },
+            { name = "aarch64-musl", host = "x86_64-musl", target = "aarch64-musl", worker = "aarch64" },
           ],
         })
         destination = "local/workers.json"