From 9ea208f457984519bb991913c591cfb7ed1593cd Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 15 Apr 2019 17:27:19 -0400 Subject: [PATCH] Update image refresh manifests --- images/alpine/build.yml | 10 ++++------ images/archlinux/build.yml | 12 ++++-------- images/debian/archgen.yml | 9 +++------ images/debian/build.yml | 10 ++++------ images/fedora/build.yml | 10 ++++------ images/freebsd/build.yml | 8 ++++---- images/nixos/build.yml | 10 ++++------ 7 files changed, 27 insertions(+), 42 deletions(-) diff --git a/images/alpine/build.yml b/images/alpine/build.yml index 6d59270..58e1644 100644 --- a/images/alpine/build.yml +++ b/images/alpine/build.yml @@ -11,8 +11,6 @@ environment: arch: x86_64 release: edge slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 @@ -38,13 +36,13 @@ tasks: MEMORY=1024 ./images/control alpine/$release sanity-check - deploy: | cd builds.sr.ht/images/alpine/$release - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \ + ssh $server mkdir -p /var/lib/images/alpine/$release/$arch + rsync -rzP $arch/root.img.qcow2 \ ${server}:/var/lib/images/alpine/$release/$arch/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/alpine/$release/$arch/new_root.img.qcow2 \ /var/lib/images/alpine/$release/$arch/root.img.qcow2 done diff --git a/images/archlinux/build.yml b/images/archlinux/build.yml index c8c6fe7..1148681 100644 --- a/images/archlinux/build.yml +++ b/images/archlinux/build.yml @@ -9,8 +9,6 @@ sources: environment: arch: x86_64 slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 @@ -33,15 +31,13 @@ tasks: fi - deploy: | cd builds.sr.ht/images/archlinux - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" \ - -rzP $arch/initrd $arch/kernel $arch/root.img.qcow2 \ + rsync -rzP $arch/initrd $arch/kernel $arch/root.img.qcow2 \ ${server}:/var/lib/images/archlinux/$arch-new - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/archlinux/$arch-new/{initrd,kernel,root.img.qcow2} \ /var/lib/images/archlinux/$arch - ssh $sshopts $server rm -rf /var/lib/images/archlinux/$arch-new + ssh $server rm -rf /var/lib/images/archlinux/$arch-new done diff --git a/images/debian/archgen.yml b/images/debian/archgen.yml index 4f894e1..e8bbd4a 100644 --- a/images/debian/archgen.yml +++ b/images/debian/archgen.yml @@ -10,8 +10,6 @@ sources: environment: release: stretch slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 @@ -28,14 +26,13 @@ tasks: MEMORY=1024 ./images/control debian/$release sanity-check - deploy: | cd builds.sr.ht/images/debian/$release - sha256sum root.img.qcow2 - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do rsync \ - --rsh="ssh $sshopts" -rzP root.img.qcow2 \ + -rzP root.img.qcow2 \ ${server}:/var/lib/images/debian/$release/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/debian/$release/new_root.img.qcow2 \ /var/lib/images/debian/$release/root.img.qcow2 done diff --git a/images/debian/build.yml b/images/debian/build.yml index 6fa8892..91bf40b 100644 --- a/images/debian/build.yml +++ b/images/debian/build.yml @@ -13,8 +13,6 @@ environment: arch: amd64 release: stretch slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 @@ -39,13 +37,13 @@ tasks: fi - deploy: | cd builds.sr.ht/images/debian/$release - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \ + ssh $server mkdir -p /var/lib/images/debian/$release/$arch + rsync -rzP $arch/root.img.qcow2 \ ${server}:/var/lib/images/debian/$release/$arch/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/debian/$release/$arch/new_root.img.qcow2 \ /var/lib/images/debian/$release/$arch/root.img.qcow2 done diff --git a/images/fedora/build.yml b/images/fedora/build.yml index f28b9bc..a609fa8 100644 --- a/images/fedora/build.yml +++ b/images/fedora/build.yml @@ -10,8 +10,6 @@ environment: arch: x86_64 release: "29" slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 @@ -30,13 +28,13 @@ tasks: MEMORY=1024 ./images/control fedora/$release sanity-check - deploy: | cd builds.sr.ht/images/fedora/$release - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \ + ssh $server mkdir -p /var/lib/images/fedora/$release/$arch + rsync -rzP $arch/root.img.qcow2 \ ${server}:/var/lib/images/fedora/$release/$arch/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/fedora/$release/$arch/new_root.img.qcow2 \ /var/lib/images/fedora/$release/$arch/root.img.qcow2 done diff --git a/images/freebsd/build.yml b/images/freebsd/build.yml index 40ae704..5686230 100644 --- a/images/freebsd/build.yml +++ b/images/freebsd/build.yml @@ -27,13 +27,13 @@ tasks: MEMORY=1024 ./images/control freebsd/$release sanity-check - deploy: | cd builds.sr.ht/images/freebsd/$release - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \ + ssh $server mkdir -p /var/lib/images/freebsd/$release/$arch + rsync -rzP $arch/root.img.qcow2 \ ${server}:/var/lib/images/freebsd/$release/$arch/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/freebsd/$release/$arch/new_root.img.qcow2 \ /var/lib/images/freebsd/$release/$arch/root.img.qcow2 done diff --git a/images/nixos/build.yml b/images/nixos/build.yml index 8f4fd13..87bd57f 100644 --- a/images/nixos/build.yml +++ b/images/nixos/build.yml @@ -14,8 +14,6 @@ environment: release: unstable arch: x86_64 slaves: - - deploy@mio.runners.sr.ht - - deploy@yui.runners.sr.ht - deploy@azusa.runners.sr.ht triggers: - action: email @@ -39,13 +37,13 @@ tasks: MEMORY=1024 ./images/control "nixos/${release}" sanity-check - deploy: | cd builds.sr.ht/images/nixos/$release - sshopts="-o StrictHostKeyChecking=no" + echo "StrictHostKeyChecking=no" >> ~/.ssh/config for server in "${slaves[@]}" do - rsync \ - --rsh="ssh $sshopts" -rzP $arch/root.img.qcow2 \ + ssh $server mkdir -p /var/lib/images/nixos/$release/$arch + rsync -rzP $arch/root.img.qcow2 \ ${server}:/var/lib/images/nixos/$release/$arch/new_root.img.qcow2 - ssh $sshopts $server \ + ssh $server \ mv /var/lib/images/nixos/$release/$arch/new_root.img.qcow2 \ /var/lib/images/nixos/$release/$arch/root.img.qcow2 done -- 2.38.5