From abae132de1ad0dbf29c40a686c985a0d12a73e8a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 13 May 2019 13:24:16 -0400
Subject: [PATCH] Flesh out OpenBSD refresh manifest

---
 contrib/crontab          |  1 +
 images/openbsd/build.yml | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/contrib/crontab b/contrib/crontab
index 1c87744..c895d40 100644
--- a/contrib/crontab
+++ b/contrib/crontab
@@ -15,6 +15,7 @@
 30 19 * * 5 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" alpine/3.9
 30 19 * * 6 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" -a amd64 freebsd/current
 0 19 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" fedora/30
+0 19 * * 1 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" openbsd/6.5
 
 # Monthly
 0 18 1 * 0 chronic /usr/local/bin/submit_image_build -n "Monthly scheduled build image refresh" -a amd64 freebsd/11.x
diff --git a/images/openbsd/build.yml b/images/openbsd/build.yml
index 85b7273..e0b9f5a 100644
--- a/images/openbsd/build.yml
+++ b/images/openbsd/build.yml
@@ -1,16 +1,12 @@
 image: openbsd/latest
 packages:
   - qemu
-  # OpenBSD 6.5 contains rsync, but it might not be 100% compatible
-  # - rsync
 sources:
   - https://git.sr.ht/~sircmpwn/builds.sr.ht
 environment:
   arch: amd64
   release: "6.5"
   slaves:
-    - deploy@mio.runners.sr.ht
-    - deploy@yui.runners.sr.ht
     - deploy@azusa.runners.sr.ht
 secrets:
   - fa00a8d3-7b63-42d5-8060-3bb31c3e3018
@@ -25,15 +21,14 @@ tasks:
   - sanity-check: |
       cd builds.sr.ht
       MEMORY=256 ./images/control openbsd/$release sanity-check
-#  - deploy: |
-#      cd builds.sr.ht/images/openbsd/$release
-#      sshopts="-o StrictHostKeyChecking=no"
-#      for server in "${slaves[@]}"
-#      do
-#        rsync \
-#          --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \
-#          ${server}:/var/lib/images/openbsd/$release/$arch/new_root.img.qcow2
-#        ssh $sshopts $server \
-#          mv /var/lib/images/openbsd/$release/$arch/new_root.img.qcow2 \
-#             /var/lib/images/openbsd/$release/$arch/root.img.qcow2
-#      done
+  - deploy: |
+      cd builds.sr.ht/images/openbsd/$release
+      echo "StrictHostKeyChecking=no" >> ~/.ssh/config
+      for server in "${slaves[@]}"
+      do
+        ssh $server mkdir -p /var/lib/images/openbsd/$release/$arch
+        rsync -rzP $arch/root.img.qcow2 \
+          ${server}:/var/lib/images/openbsd/$release/$arch/new_root.img.qcow2
+        ssh $server mv /var/lib/images/openbsd/$release/$arch/new_root.img.qcow2 \
+             /var/lib/images/openbsd/$release/$arch/root.img.qcow2
+      done
-- 
2.38.5