buildbot: keep built packages separate with xbps-src -r, sync multilib properly

Author: classabbyamp

services/nomad/build/buildbot.cfg

@@ -203,6 +203,7 @@ def make_xbps_bulk_cmd(props):
         '-h', hostdir,
         '-d', distdir(''),
         '-m', buildroot(),
+        '-c', util.Interpolate(f'-r %(prop:target)s-%(prop:buildnumber)s'),
         '-t', '-s', '-S',
     ]
     if props.getProperty('cross') == 'True':
@@ -220,28 +221,45 @@ def make_xbps_bulk_cmd(props):
 def make_rsync_cmd(props):
     return ['bash', '-e', '-c',
             util.Interpolate("""
+BUILDREPO="%(prop:target)s-%(prop:buildnumber)s"
 echo "=> Syncing packages to the shadow repository..."
 rsync -vurk --delete-after --remove-source-files \
 --filter='+ */' --filter='+ *.%(prop:target)s.xbps' \
 --filter='- .*' --filter='- *' \
---password-file=/secrets/rsync/password /hostdir/binpkgs/ \
+--password-file=/secrets/rsync/password /hostdir/binpkgs/$BUILDREPO/ \
 {{ range nomadService 1 $allocID "build-rsyncd" -}}
 rsync://buildsync@{{ .Address }}:{{ .Port }}/incoming-%(prop:target)s
 {{ end -}}
-RSYNC_EXIT="$?"
-echo "=> Cleaning repodatas..."
-find /hostdir/binpkgs -name '%(prop:target)s-repodata' -print -delete
-case "$RSYNC_EXIT" in
-    0|23|24) exit 0 ;;
+case "$?" in
+    0|23|24) ;;
     *) exit 1 ;;
 esac
+if [ "%(prop:target)s" = i686 ] && [ -d "/hostdir/binpkgs/$BUILDREPO/multilib" ]; then
+    echo "=> Syncing packages to the shadow repository..."
+    rsync -vurk --delete-after --remove-source-files \
+    --filter='+ */' --filter='+ *.x86_64.xbps' \
+    --filter='- .*' --filter='- *' \
+    --password-file=/secrets/rsync/password /hostdir/binpkgs/$BUILDREPO/multilib/ \
+    {{ range nomadService 1 $allocID "build-rsyncd" -}}
+    rsync://buildsync@{{ .Address }}:{{ .Port }}/incoming-%(prop:target)s/multilib/
+    {{ end -}}
+    case "$?" in
+        0|23|24) ;;
+        *) exit 1 ;;
+    esac
+fi
+echo "=> Cleaning repodatas..."
+find /hostdir/binpkgs/$BUILDREPO -name '%(prop:target)s-repodata' -print -delete
+if [ "%(prop:target)s" = i686 ] && [ -d "/hostdir/binpkgs/$BUILDREPO/multilib" ]; then
+    find /hostdir/binpkgs/$BUILDREPO/multilib -name 'x86_64-repodata' -print -delete
+fi
 """)]
 
 
 @util.renderer
 def make_update_repo_cmd(props):
     return ['bash', '-e', '-c',
-            util.Interpolate(f"""
+            util.Interpolate("""
 echo "=> Moving packages to the shadow repository..."
 rsync -vurk --delete-after --password-file=/secrets/rsync/password \
 {{ range nomadService 1 $allocID "build-rsyncd" -}}
@@ -262,11 +280,7 @@ 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',
-    ],
+    return ['rm', '-vr', util.Interpolate('/hostdir/binpkgs/%(prop:target)s-%(prop:buildnumber)s')]
 
 
 @util.renderer