From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SPeDHgeCSF/sJAAA0tVLHw (envelope-from ) for ; Fri, 28 Aug 2020 04:03:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SE1kGgeCSF8TIAAA1q6Kng (envelope-from ) for ; Fri, 28 Aug 2020 04:03:19 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B23A6940656 for ; Fri, 28 Aug 2020 04:03:18 +0000 (UTC) Received: from localhost ([::1]:38136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBVbh-0005Ee-Fb for larch@yhetil.org; Fri, 28 Aug 2020 00:03:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBVbY-0005EF-LB for guix-devel@gnu.org; Fri, 28 Aug 2020 00:03:08 -0400 Received: from mail-qv1-xf42.google.com ([2607:f8b0:4864:20::f42]:43214) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBVbW-0000as-Ey for guix-devel@gnu.org; Fri, 28 Aug 2020 00:03:08 -0400 Received: by mail-qv1-xf42.google.com with SMTP id l13so3752733qvt.10 for ; Thu, 27 Aug 2020 21:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lHqKikM+wdWufz5pmadFNPdCJcRpZFfiHdCzGdAQVmg=; b=Oh0gu0P/RIbxVItlvj0MjBW8nFq8uoj4sCm1dEgjqiHpsLmm0TmxDZco0Q1iIYhwtB lpPbzGVrc5Kzj2DdvVUYbUPtLDH6nVELW5S/MmyolDZ2qB+2TYHVeUNXSgQK3/2+cLBr BwlhCw1kjC4lHESrv6bEeL4u9qTHi6wnUkMVXn7UaRre1Bylb/eZlTYjIMhKCZ8T8wxP ve6xLD6Qdex6+I6/Ovtl0zhSzM7VYvQJ3YK0ekotQwgPW51FV/ofFKtqygG6C6qX8MYp VuUzMU/2ZGaGSgn/Kmx+LkxFV+36vyrsJiIOImx6jtEFpXXdlZyxiZnr/sZUI1msorb5 bN6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lHqKikM+wdWufz5pmadFNPdCJcRpZFfiHdCzGdAQVmg=; b=cuKy/Op2pQkIMEmGnzYrNviu8wsK44qWTISXtdlZ09re+iYO8YhD6Au+5V42OxHYL6 jJOVUbImxKBUoX3xyb57yBMVACvEH2sLE0Em/4ImElMkH0hv5kd47xtvAYQm1bDugT0B nyMmU2EpljhAnBHrfbg2J4Bk+Te5pgXOkGuVkNVY7HOSLpk8+5iKLE/fpdPI8JeT0rLi Qt3sPy9+qQj9QlyMFzmuaJyYiQx7eiErvFmY1a3EfWPjUyyuWNTuVYXufrr9XFBc/3lo LHXp//PVN6YJTV62t9y9UWpUobNuB5IUUhCemtdez69gs9BnKnGCOjKDVJV79+EBzSTj g8LA== X-Gm-Message-State: AOAM530bv7NAxg7B/5ecBPuOSH5ysmZoI/a/shgFSFG5x3iIWFW/7znk ypoMaouTWdgKGrRrVm5LpHVhCredV+o= X-Google-Smtp-Source: ABdhPJyShqjNt9VrF6zLosBWSyW7Tj5yudMPlhAKvcAwUXCfEw5ZC2Ps51GhITkrLdkMn2JYv4ZZPA== X-Received: by 2002:a0c:f584:: with SMTP id k4mr690948qvm.6.1598587385039; Thu, 27 Aug 2020 21:03:05 -0700 (PDT) Received: from localhost.localdomain (dsl-205-151-56-239.b2b2c.ca. [205.151.56.239]) by smtp.gmail.com with ESMTPSA id o72sm3579103qka.113.2020.08.27.21.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 21:03:04 -0700 (PDT) From: Maxim Cournoyer To: guix-devel@gnu.org Subject: [PATCH] hydra: Use the new 'systems' field for build-machine definitions. Date: Fri, 28 Aug 2020 00:02:13 -0400 Message-Id: <20200828040213.3780-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f42; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf42.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Cournoyer Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Oh0gu0P/; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: 3.79 X-TUID: ot0AbmN0xxJp * hydra/machines-bayfront.scm (harbourfront): Change system to systems, and include i686-linux in the list of systems. (milano): Likewise. (harbourfront-i686): Remove. (milano-i686): Likewise. (dover, redhill): Adapt to use the new systems field. * hydra/machines-for-berlin.scm (template-x86_64): Change system to systems, and include i686-linux in the list of systems. (x86_64->i686): Remove. (aarch64->armhf, x86_64->qemu-aarch64, x86_64->childhurd) (overdrive, armv7): Adapt to use the new systems field. --- hydra/berlin-nodes.scm | 2 +- hydra/machines-bayfront.scm | 19 ++++------------- hydra/machines-for-berlin.scm | 40 ++++++++++++++++------------------- 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/hydra/berlin-nodes.scm b/hydra/berlin-nodes.scm index 8f8f38e..37f1b6c 100644 --- a/hydra/berlin-nodes.scm +++ b/hydra/berlin-nodes.scm @@ -4,7 +4,7 @@ (use-modules (sysadmin build-machines) (sysadmin people) (srfi srfi-1) - (ice-9 match)) + (ice-9 match)) (define nodes '((101 diff --git a/hydra/machines-bayfront.scm b/hydra/machines-bayfront.scm index bbb7d48..9f5cc9c 100644 --- a/hydra/machines-bayfront.scm +++ b/hydra/machines-bayfront.scm @@ -1,34 +1,26 @@ (define harbourfront (build-machine (name "harbourfront.guix.info") - (system "x86_64-linux") + (systems '("x86_64-linux" "i686-linux")) (user "bayfront") (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBfd3VZqyoKoZG3X772eDBrN2MPhnNDDnVA34hpf0f9b root@(none)") (parallel-builds 3) (speed 1.0))) -(define harbourfront-i686 - (build-machine (inherit harbourfront) - (system "i686-linux"))) - (define milano (build-machine (name "milano-guix-1.di.unimi.it") - (system "x86_64-linux") + (systems '("x86_64-linux" "i686-linux")) (user "bayfront") (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPJFpBJSaOK2aDaR48Fm8udhLK9fl5YwNlq43uaLBeRv root@(none)") (parallel-builds 3) (speed 1.0))) -(define milano-i686 - (build-machine (inherit milano) - (system "i686-linux"))) - (define dover (build-machine (name "dover.guix.info") (port 9023) - (system "aarch64-linux") + (systems '("aarch64-linux")) (user "bayfront") (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLRYD5RXZ3Espe+Kv1SzZl8Qc3NZ356Bq+cGjnKsDHY root@linux") (parallel-builds 3) @@ -38,7 +30,7 @@ (build-machine (name "redhill.guix.info") (port 9022) - (system "armhf-linux") + (systems '("armhf-linux")) (user "bayfront") (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+FYr1NUTsXrJgquSTMz0Izkqw3ob7pCU+JPFHgEhHa root@redhill") (parallel-builds 3) @@ -46,10 +38,7 @@ (list harbourfront - harbourfront-i686 milano - milano-i686 dover redhill ) - diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm index 69c918a..9ebea04 100644 --- a/hydra/machines-for-berlin.scm +++ b/hydra/machines-for-berlin.scm @@ -133,7 +133,7 @@ (build-machine (name name) (user "hydra") - (system "x86_64-linux") + (systems '("x86_64-linux" "i686-linux")) (host-key key) (compression "no") (speed 3) ;don't increase it too much @@ -143,7 +143,7 @@ (build-machine (name name) (user "hydra") - (system "x86_64-linux") + (systems '("x86_64-linux" "i686-linux")) (host-key key) (compression "no") (speed 3) ;don't increase it too much @@ -153,41 +153,37 @@ (build-machine (name ip) (user "hydra") - (system "x86_64-linux") + (systems '("x86_64-linux" "i686-linux")) (host-key key) (compression "no") (speed 2) (parallel-builds 2))))) -(define (x86_64->i686 machine) - (build-machine (inherit machine) - (system "i686-linux"))) - (define (aarch64->armhf machine) (build-machine (inherit machine) - (system "armhf-linux") + (systems '("armhf-linux")) (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") + (systems '("armhf-linux")) (speed .8) ;prefer the "native" AArch64 machines (parallel-builds 1))) (define (x86_64->qemu-aarch64 machine) (build-machine (inherit machine) - (system "aarch64-linux") + (systems '("aarch64-linux")) (speed .9) (parallel-builds 1))) (define (x86_64->childhurd machine) (build-machine (inherit machine) - (system "i586-gnu") + (systems '("i586-gnu")) (parallel-builds 1))) (define overdrive @@ -198,7 +194,7 @@ (name "overdrive1.guixsd.org") (port 52522) (user "hydra") - (system "aarch64-linux") + (systems '("aarch64-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf2f93c90oi9s9qGVGWC3sDgG7kEBvIEwR021NsfG+z root@overdrive") (parallel-builds 2)) @@ -208,7 +204,7 @@ (name "dover.guix.info") (port 9023) (user "hydra") - (system "aarch64-linux") + (systems '("aarch64-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLRYD5RXZ3Espe+Kv1SzZl8Qc3NZ356Bq+cGjnKsDHY root@linux") (parallel-builds 2)) @@ -222,7 +218,7 @@ (name "localhost") (port 2230) (user "hydra") - (system "aarch64-linux") + (systems '("aarch64-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIXfDYhBeVH0GenVp8PplaRF1jtNSOdLeNWf2k8G7K71 root@gnu") (parallel-builds 2)) @@ -234,7 +230,7 @@ ;; (port 5552) (name "localhost") (port 2223) (user "hydra") - (system "aarch64-linux") + (systems '("aarch64-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICqbQjcGAlYRunem82lXhc0T0xWWQUh53UPXzZzBePVQ nckx@dmitri.tobias.gr") (parallel-builds 2)) @@ -245,7 +241,7 @@ ;; (port 5551) (name "localhost") (port 2222) (user "hydra") - (system "aarch64-linux") + (systems '("aarch64-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMbnlRcOJwtlNVc3LcEgagqXNEWya666RiwBHImXtjUJ nckx@sergei.tobias.gr") (parallel-builds 2)))) @@ -256,20 +252,20 @@ (build-machine (name "guix-x15.sjd.se") (user "hydra") - (system "armhf-linux") + (systems '("armhf-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOfXjwCAFWeGiUoOVXEgtIeXxbtymjOTg7ph1ObMAcJ0 root@beaglebone")) (build-machine (name "guix-x15b.sjd.se") (user "hydra") - (system "armhf-linux") + (systems '("armhf-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEbCOTTg9Tl0E23Mnc0UA4Ib2W5oDqTukk6mT98tOph root@beaglebone")) #;(build-machine (name "hydra-slave1.netris.org") (port 7275) (user "hydra") - (system "armhf-linux") + (systems '("armhf-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDAe9mXufZXFfFlezafA/G2Nng66ssLLi5xPP+9NhGm root@hydra-slave1") (speed 1.0) (parallel-builds 2)) @@ -279,7 +275,7 @@ (name "hydra-slave2.netris.org") (port 7276) (user "hydra") - (system "armhf-linux") + (systems '("armhf-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzlJZzZfPiEcehmLFtQVYVt3j9w4DHPL6YgSC3EHJK+ root@hydra-slave2") (speed 1.0) (parallel-builds 2)) @@ -289,7 +285,7 @@ (name "hydra-slave3.netris.org") (port 7274) (user "hydra") - (system "armhf-linux") + (systems '("armhf-linux")) (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLOVhnS24E+Z1bXLUU4z4gE5+HsFxDxUPA6MbLHmnME root@hydra-slave3") (speed 1.0) (parallel-builds 2)))) @@ -305,7 +301,7 @@ (fast/hurd (filter (compose childhurd-ip? build-machine-name) fast))) (append overdrive (map aarch64->armhf overdrive) armv7 - x86_64 (map x86_64->i686 x86_64) + x86_64 (map x86_64->qemu-aarch64 fast) (map x86_64->qemu-armhf fast) (map x86_64->childhurd fast/hurd))) -- 2.27.0