From ef865cdfcadb9ea05d34943e135f9f271478d8e9 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 21 Feb 2019 19:31:38 -0500 Subject: [PATCH] Add azusa to build runners --- images/alpine/build.yml | 8 +++++++- images/archlinux/build.yml | 1 + images/debian/archgen.yml | 2 ++ images/debian/build.yml | 1 + images/fedora/build.yml | 1 + images/freebsd/build.yml | 1 + images/netbsd/build.yml | 1 + images/nixos/build.yml | 8 +++++++- images/ubuntu/build.yml | 1 + 9 files changed, 22 insertions(+), 2 deletions(-) diff --git a/images/alpine/build.yml b/images/alpine/build.yml index d4e4e2d..6d59270 100644 --- a/images/alpine/build.yml +++ b/images/alpine/build.yml @@ -13,6 +13,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: @@ -24,7 +25,12 @@ tasks: cd builds.sr.ht/images/alpine/$release sudo ./genimg $arch - kvm: | - sudo modprobe kvm-intel + if grep -i amd /proc/cpuinfo + then + sudo modprobe kvm_amd + else + sudo modprobe kvm_intel + fi sleep 1 sudo chown build:build /dev/kvm - sanity-check: | diff --git a/images/archlinux/build.yml b/images/archlinux/build.yml index baf816b..c8c6fe7 100644 --- a/images/archlinux/build.yml +++ b/images/archlinux/build.yml @@ -11,6 +11,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: diff --git a/images/debian/archgen.yml b/images/debian/archgen.yml index 5790779..4f894e1 100644 --- a/images/debian/archgen.yml +++ b/images/debian/archgen.yml @@ -11,6 +11,8 @@ 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 tasks: diff --git a/images/debian/build.yml b/images/debian/build.yml index 24174f8..6fa8892 100644 --- a/images/debian/build.yml +++ b/images/debian/build.yml @@ -15,6 +15,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: diff --git a/images/fedora/build.yml b/images/fedora/build.yml index 0b8b2e9..a0c4b20 100644 --- a/images/fedora/build.yml +++ b/images/fedora/build.yml @@ -12,6 +12,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: diff --git a/images/freebsd/build.yml b/images/freebsd/build.yml index 26c29c8..40ae704 100644 --- a/images/freebsd/build.yml +++ b/images/freebsd/build.yml @@ -11,6 +11,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: diff --git a/images/netbsd/build.yml b/images/netbsd/build.yml index f94c316..a10e8e3 100644 --- a/images/netbsd/build.yml +++ b/images/netbsd/build.yml @@ -11,6 +11,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: diff --git a/images/nixos/build.yml b/images/nixos/build.yml index ce5e635..8f4fd13 100644 --- a/images/nixos/build.yml +++ b/images/nixos/build.yml @@ -16,13 +16,19 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht triggers: - action: email condition: failure to: Drew DeVault tasks: - kvm: | - sudo modprobe kvm-intel + if grep -i amd /proc/cpuinfo + then + sudo modprobe kvm_amd + else + sudo modprobe kvm_intel + fi sleep 1 sudo chown build:build /dev/kvm - genimg: | diff --git a/images/ubuntu/build.yml b/images/ubuntu/build.yml index 602f970..c0d9b05 100644 --- a/images/ubuntu/build.yml +++ b/images/ubuntu/build.yml @@ -15,6 +15,7 @@ environment: slaves: - deploy@mio.runners.sr.ht - deploy@yui.runners.sr.ht + - deploy@azusa.runners.sr.ht secrets: - fa00a8d3-7b63-42d5-8060-3bb31c3e3018 triggers: -- 2.38.5