services/nomad/build/buildbot: persist void-packages and xbps-bulk checkouts

it's annoying when they go away

also don't force_pull images

Closes: #213 [via git-merge-pr]

Author: classabbyamp

services/nomad/build/buildbot-worker.nomad

@@ -29,21 +29,37 @@ job "buildbot-worker" {
         }
       }
 
+      dynamic "volume" {
+        for_each = [ "${group.value.name}" ]
+        labels = [ "${volume.value}_workdir" ]
+
+        content {
+          type = "host"
+          source = "${volume.value}_workdir"
+          read_only = false
+        }
+      }
+
       // https://github.com/hashicorp/nomad/issues/8892
-      task "prep-hostdir" {
+      task "prep-host-dirs" {
         driver = "docker"
 
         config {
           image = "ghcr.io/void-linux/void-glibc-full:20240526R1"
           command = "chown"
-          args = ["-R", "418:418", "/hostdir"]
+          args = ["418:418", "/hostdir", "/workdir"]
         }
 
         volume_mount {
           volume = "${group.value.name}_hostdir"
           destination = "/hostdir"
         }
 
+        volume_mount {
+          volume = "${group.value.name}_workdir"
+          destination = "/workdir"
+        }
+
         lifecycle {
           hook = "prestart"
         }
@@ -56,7 +72,6 @@ job "buildbot-worker" {
 
         config {
           image = "ghcr.io/void-linux/infra-buildbot-builder:20240928R1"
-          force_pull = true
           cap_add = ["sys_admin"]
         }
 
@@ -70,6 +85,11 @@ job "buildbot-worker" {
           destination = "/hostdir"
         }
 
+        volume_mount {
+          volume = "${group.value.name}_workdir"
+          destination = "/workdir"
+        }
+
         template {
           data = <<EOF
 {{ range service "buildbot-worker" -}}

services/nomad/build/buildbot.cfg

@@ -121,8 +121,8 @@ c['schedulers'].append(schedulers.ForceScheduler(
 
 # ###### BUILDERS
 
-distdir = 'void-packages'
-bulkdir = 'xbps-bulk'
+distdir = lambda f: util.Interpolate(f'/workdir/%(prop:name)s/void-packages/{f}')
+bulkdir = lambda f: util.Interpolate(f'/workdir/%(prop:name)s/xbps-bulk/{f}')
 hostdir = '/hostdir'
 buildroot = 'buildroot'
 builddir = lambda: util.Interpolate('builddir-%(prop:buildnumber)s')
@@ -136,7 +136,7 @@ factory = util.BuildFactory()
 @util.renderer
 def make_xbps_src_cmd(props, cmd):
     command = [
-        f'{distdir}/xbps-src',
+        distdir('xbps-src'),
         '-H', hostdir,
         '-m', buildroot,
         '-A', props.getProperty('host'),
@@ -155,9 +155,9 @@ def make_xbps_src_cmd(props, cmd):
 @util.renderer
 def make_xbps_bulk_cmd(props):
     command = [
-        f'../{bulkdir}/configure',
+        bulkdir('configure'),
         '-h', hostdir,
-        '-d', f'../{distdir}',
+        '-d', distdir(''),
         '-m', f'../{buildroot}',
         '-t',
     ]
@@ -234,7 +234,7 @@ rsync://buildsync-%(prop:worker)s@{{ .Address }}:{{ .Port }}/%(prop:worker)s
 factory.addStep(steps.Git(
     repourl='https://github.com/void-linux/void-packages.git',
     mode='incremental',
-    workdir=distdir,
+    workdir=distdir(''),
     progress=True,
     alwaysUseLatest=True,
     name='update_void_packages',
@@ -247,7 +247,7 @@ factory.addStep(steps.Git(
 factory.addStep(steps.Git(
     repourl='https://github.com/void-linux/xbps-bulk.git',
     mode='incremental',
-    workdir=bulkdir,
+    workdir=bulkdir(''),
     progress=True,
     alwaysUseLatest=True,
     name='update_xbps_bulk',

services/nomad/build/buildbot.nomad

@@ -61,7 +61,6 @@ job "buildbot" {
 
       config {
         image = "ghcr.io/void-linux/infra-buildbot:20240928R1"
-        force_pull = true
         ports = ["http", "worker"]
       }