[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: hydra: berlin: Add Qemu armhf/aarch64 build nodes.
From: |
Ricardo Wurmus |
Subject: |
01/02: hydra: berlin: Add Qemu armhf/aarch64 build nodes. |
Date: |
Wed, 8 May 2019 11:29:43 -0400 (EDT) |
rekado pushed a commit to branch master
in repository maintenance.
commit 94966b0c37bad73eeb2ccab93bdfd6c3fd7623da
Author: Ricardo Wurmus <address@hidden>
Date: Wed May 8 17:26:11 2019 +0200
hydra: berlin: Add Qemu armhf/aarch64 build nodes.
* hydra/machines-for-berlin.scm (x86_64->qemu-armhf,
x86_64->qemu-aarch64): New procedures; use them to add five virtual
build nodes for both architectures.
---
hydra/machines-for-berlin.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index 91df46a..d4f14b2 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -1,5 +1,5 @@
;; Install this file as /etc/guix/machines.scm on berlin.guixsd.org
-(use-modules (ice-9 match))
+(use-modules (ice-9 match) (srfi srfi-1))
;; These are all hosted at the MDC in rack A4. They are connected to
;; a dedicated VLAN and can only be accessed from berlin.guixsd.org.
@@ -113,6 +113,20 @@
(speed .9)
(parallel-builds 1))) ;limit to favor the "real" ARMv7 machines
+(define (x86_64->qemu-armhf machine)
+ (build-machine
+ (inherit machine)
+ (system "armhf-linux")
+ (speed .9)
+ (parallel-builds 1)))
+
+(define (x86_64->qemu-aarch64 machine)
+ (build-machine
+ (inherit machine)
+ (system "aarch64-linux")
+ (speed .9)
+ (parallel-builds 1)))
+
(define overdrive
;; The SoftIron OverDrive 1000 donated by ARM:
;; <https://softiron.com/development-tools/overdrive-1000/>.
@@ -150,4 +164,7 @@
(let ((x86_64 (map template-x86_64 hosts)))
(append overdrive (map aarch64->armhf overdrive)
armv7
- x86_64 (map x86_64->i686 x86_64)))
+ x86_64 (map x86_64->i686 x86_64)
+ (map x86_64->qemu-aarch64 (take (drop x86_64 5) 5))
+ (map x86_64->qemu-armhf (take x86_64 5))))
+