TEMP: for local testing, REMOVE ME

Author: classabbyamp

services/nomad/build/build-rsyncd.nomad

@@ -9,7 +9,7 @@ job "build-rsyncd" {
       mode = "bridge"
       port "rsync" {
         to = 873
-        host_network = "internal"
+        # XXX: host_network = "internal"
       }
     }
 

services/nomad/build/buildbot-worker.nomad

@@ -8,9 +8,13 @@ job "buildbot-worker" {
       // cpu is ~equivalent to a number of cores
       // 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 = 21700, mem = 57690,  mem_max = 60890  },
-      { name = "aarch64", jobs = 12, cpu = 16000, mem = 27500,  mem_max = 29500  },
+      # XXX
+      # { name = "glibc",   jobs = 10, cpu = 38100, mem = 115840, mem_max = 122270 },
+      # { name = "musl",    jobs = 6,  cpu = 21700, mem = 57690,  mem_max = 60890  },
+      # { name = "aarch64", jobs = 12, cpu = 16000, mem = 27500,  mem_max = 29500  },
+      { name = "glibc",   jobs = 2, cpu = 10000, mem = 4096, mem_max = 8192 },
+      { name = "musl",    jobs = 2, cpu = 10000, mem = 4096, mem_max = 8192 },
+      { name = "aarch64", jobs = 2, cpu = 10000, mem = 4096, mem_max = 8192 },
     ]
     labels = [ "buildbot-worker-${group.value.name}" ]
 
@@ -118,9 +122,10 @@ job "buildbot-worker" {
           destination = "/buildroots"
         }
 
+        # XXX
         template {
           data = <<EOF
-{{ range service "buildbot-worker" -}}
+{{ range nomadService "buildbot-worker" -}}
 [buildbot]
 host = {{ .Address }}
 worker-port = {{ .Port }}
@@ -132,6 +137,7 @@ EOF
           destination = "local/config.ini"
         }
 
+        # XXX
         template {
           data = <<EOF
 XBPS_MAKEJOBS=${group.value.jobs}
@@ -141,7 +147,7 @@ XBPS_DEBUG_PKGS=yes
 XBPS_USE_GIT_REVS=yes
 XBPS_DISTFILES_MIRROR=https://sources.voidlinux.org
 XBPS_PRESERVE_PKGS=yes
-{{ range service "root-pkgs-internal" }}
+{{ range nomadService "root-pkgs-internal" }}
 XBPS_MIRROR=http://{{ .Address }}:{{ .Port }}
 {{ end }}
 EOF
@@ -161,9 +167,10 @@ EOF
         }
 
         // the builders should use local repos
+        # XXX
         template {
           data = <<EOF
-{{ range service "root-pkgs-internal" }}
+{{ range nomadService "root-pkgs-internal" }}
 {{ if eq "${group.value.name}" "glibc" }}
 repository=http://{{ .Address }}:{{ .Port }}/bootstrap
 repository=http://{{ .Address }}:{{ .Port }}

services/nomad/build/buildbot.cfg

@@ -253,7 +253,8 @@ find /hostdir/binpkgs -name '*.xbps' -o -name '*-repodata' -print -delete
 
 
 factory.addStep(GitWithDiff(
-    repourl='https://github.com/void-linux/void-packages.git',
+    # XXX
+    repourl='https://github.com/classabbyamp/void-packages.git',
     mode='incremental',
     workdir=distdir(''),
     progress=True,
@@ -266,7 +267,8 @@ factory.addStep(GitWithDiff(
 ))
 
 factory.addStep(steps.Git(
-    repourl='https://github.com/void-linux/xbps-bulk.git',
+    # XXX
+    repourl='https://github.com/classabbyamp/xbps-bulk.git',
     mode='incremental',
     workdir=bulkdir(''),
     progress=True,

services/nomad/build/buildbot.nomad

@@ -17,7 +17,7 @@ job "buildbot" {
 
       port "worker" {
         to = 42042
-        host_network = "internal"
+        # XXX: host_network = "internal"
       }
     }
 
@@ -33,7 +33,9 @@ job "buildbot" {
       source = "netauth_config"
     }
 
+    # XXX
     service {
+      provider = "nomad"
       name = "buildbot-www"
       port = "http"
 
@@ -46,12 +48,16 @@ job "buildbot" {
       }
     }
 
+    # XXX
     service {
+      provider = "nomad"
       name = "buildbot-worker"
       port = "worker"
     }
 
+    # XXX
     service {
+      provider = "nomad"
       name = "buildbot-metrics"
       port = "metrics"
     }
@@ -84,17 +90,18 @@ job "buildbot" {
         read_only = true
       }
 
+      # XXX
       template {
         data = <<EOF
 [buildbot]
 worker-port = 42042
-url = https://build.voidlinux.org/
+# url = https://build.voidlinux.org/
 
 [irc]
 host = irc.libera.chat
-nick = void-builder
-channel = #xbps
-authz = duncaen maldridge abby
+nick = abby-testbot
+channel = ###abby-testbot
+authz = abby
 EOF
         destination = "local/config.ini"
       }
@@ -109,11 +116,13 @@ EOF
           builders = [
             { name = "x86_64",       host = "x86_64",                               worker = "glibc",  },
             { name = "i686",         host = "i686",                                 worker = "glibc",  },
-            { name = "armv7l",       host = "x86_64",      target = "armv7l",       worker = "glibc",  },
-            { name = "armv6l",       host = "x86_64",      target = "armv6l",       worker = "glibc",  },
+            # XXX
+            # { name = "armv7l",       host = "x86_64",      target = "armv7l",       worker = "glibc",  },
+            # { name = "armv6l",       host = "x86_64",      target = "armv6l",       worker = "glibc",  },
             { 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",   },
+            # XXX
+            # { 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" },
           ],

services/nomad/build/root-pkgs-httpd.nomad

@@ -13,6 +13,7 @@ job "build-mirror" {
     }
 
     service {
+      provider = "nomad" # XXX
       name = "root-pkgs-internal"
       port = "http"
     }