services/nomad/build/buildbot: sync after every package build

this should help make hostmakedepends build races less common

Author: classabbyamp

services/nomad/build/buildbot.cfg

@@ -217,6 +217,34 @@ def make_xbps_bulk_cmd(props):
     return command
 
 
+@util.renderer
+def make_rsync_cmd(props):
+    return ['bash', '-e', '-c',
+            util.Interpolate("""
+echo "=> Syncing packages to the shadow repository..."
+rsync -vurk --delete-after \
+--filter='+ */' --filter='+ *.%(prop:target)s.xbps' \
+--filter='- .*' --filter='- *' \
+--password-file=/secrets/rsync/password /hostdir/binpkgs/ \
+{{ range nomadService 1 $allocID "build-rsyncd" -}}
+rsync://buildsync@{{ .Address }}:{{ .Port }}/incoming-%(prop:target)s
+{{ end -}}
+case "$?" in
+    0|23|24) exit 0 ;;
+    *) exit 1 ;;
+esac
+""")]
+
+
+@util.renderer
+def make_clean_cmd(props):
+    return [
+        'find', '/hostdir/binpkgs', '(',
+            '-name', util.Interpolate('*.%(prop:target)s.xbps'), '-o', '-name', util.Interpolate('%(prop:target)s-repodata'),
+        ')', '-print', '-delete',
+    ],
+
+
 @util.renderer
 def build_packages(props):
     cmds = []
@@ -226,6 +254,11 @@ def build_packages(props):
             logname=f'pkg:{p}',
             haltOnFailure=True,
         ))
+        cmds.append(util.ShellArg(
+            command=make_rsync_cmd,
+            logname=f'sync:{p}',
+            haltOnFailure=True,
+        ))
     if cmds:
         cmds.append(util.ShellArg(
             command=['make', 'clean'],
@@ -235,23 +268,6 @@ def build_packages(props):
     return cmds
 
 
-@util.renderer
-def make_rsync_cmd(props):
-    return ['bash', '-e', '-c',
-            util.Interpolate("""
-echo "=> Syncing packages to the shadow repository..."
-rsync -vurk --delete-after \
---filter='+ */' --filter='+ *.%(prop:target)s.xbps' \
---filter='- .*' --filter='- *' \
---password-file=/secrets/rsync/password /hostdir/binpkgs/ \
-{{ range nomadService 1 $allocID "build-rsyncd" -}}
-rsync://buildsync@{{ .Address }}:{{ .Port }}/incoming-%(prop:target)s
-{{ end -}}
-echo "=> Cleaning built packages..."
-find /hostdir/binpkgs -name '*.xbps' -o -name '*-repodata' -print -delete
-""")]
-
-
 factory.addStep(GitWithDiff(
     repourl='https://github.com/void-linux/void-packages.git',
     mode='incremental',
@@ -346,20 +362,15 @@ factory.addStep(steps.ShellSequence(
 ))
 
 factory.addStep(steps.ShellCommand(
-    command=make_rsync_cmd,
-    name='sync_packages',
-    description='syncing packages to the shadow repository',
-    descriptionDone='synced packages to the shadow repository',
+    command=make_clean_cmd,
+    name='clean_packages',
+    description='cleaning packages from hostdir',
+    descriptionDone='cleaned packages from hostdir',
     alwaysRun=True,
     logEnviron=False,
     usePTY=True,
     workdir='.',
     timeout=14400,
-    decodeRC={
-        0: SUCCESS,
-        23: SUCCESS,
-        24: SUCCESS,
-    },
 ))
 
 for b in builders: