From patchwork Sat Jun 13 19:41:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 22698 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B45BC27BBE1; Sat, 13 Jun 2020 20:42:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 34EF727BBE1 for ; Sat, 13 Jun 2020 20:42:08 +0100 (BST) Received: from localhost ([::1]:58734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkC2Z-0004yi-OD for patchwork@mira.cbaines.net; Sat, 13 Jun 2020 15:42:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkC2T-0004yG-U8 for guix-patches@gnu.org; Sat, 13 Jun 2020 15:42:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkC2T-0007CJ-KK for guix-patches@gnu.org; Sat, 13 Jun 2020 15:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jkC2T-0001oH-IH for guix-patches@gnu.org; Sat, 13 Jun 2020 15:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41839] [PATCH 2/2] ci: Build Guix System images. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jun 2020 19:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41839@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 41839-submit@debbugs.gnu.org id=B41839.15920773186940 (code B ref 41839); Sat, 13 Jun 2020 19:42:01 +0000 Received: (at 41839) by debbugs.gnu.org; 13 Jun 2020 19:41:58 +0000 Received: from localhost ([127.0.0.1]:42529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2Q-0001ns-57 for submit@debbugs.gnu.org; Sat, 13 Jun 2020 15:41:58 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:35255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkC2O-0001na-2Z for 41839@debbugs.gnu.org; Sat, 13 Jun 2020 15:41:56 -0400 Received: by mail-wm1-f43.google.com with SMTP id q25so11038710wmj.0 for <41839@debbugs.gnu.org>; Sat, 13 Jun 2020 12:41:55 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ChS2n0k+eLzuFXhOzdvyWOaEhGQRMmPxCDXUtZxs5+w=; b=UW5GWZhxB2yTzrmJmn+gKkL/LdKH7m0mN4quOGIFctbvZ5wXiCq1H+U+/jriheLybS QpNUNzPh8bMKMY0STubBvLxe+O86YI5Z7che1zabgWd+GK5R8VQFDioLnft2OWMbHkjg ISP5+l9OvsAfF+7zTlYyZ9bF1+emslnT/Q2BjDB17ts/g3gDOvS+ERl4Goamx6JW/p4D Zr3whn5oE2J8d9PjRn4Vo9lcJoLlVEv1HEq4yUQqcZw3cC4wwaeJ7izE0y93p/97oIqH loEvHq7PIEoKqmFaZx8/VY5fWnLQHI24VMAlz7zk7bsaNsAMY+v7lK6Z45AJslt8HEUf 3Tfw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ChS2n0k+eLzuFXhOzdvyWOaEhGQRMmPxCDXUtZxs5+w=; b=Ii69crHFnxZ+5I2ll6runWCAkzFGH9168JbtUDwZCA9Q+rF1cBcwUtYCr9mguf5CL6 bmaC7FNm7/jmAOf3EmywfvKIcwl8HtF8ZM5KykLaHAH+0NoT1KRrA4InDFVOddzghGO8 3CP7GBN891fGfAyO7q7vaRE5GyoJIpSnvmayUEsM2RQg91YVTOrOiW+xt1Z24DlgAjHu GIAPeP7AbDJ16VRuA3QVCsrrq6CF1pBOLNCOqYY5mHdcG/s1tjozYLnKS+GMp3IV2xzi h6TDbYt42KRfYBzHoGf8g9JyEtho7DcAKHVCXML1LE/RL8sgEBwQnvToJR2PBroQlVOE pzQQ== X-Gm-Message-State: AOAM532QoggR2dvh/2Yf+flSH8hEOT0ttmxVCxUd03by1j+YjsMlYZ2/ JlwYOGNNJxhKa2Cc2LMmWUXcxd9Amzk= X-Google-Smtp-Source: ABdhPJwjSKh8/AOt9KtyLbMS9cq5/qaWoEV2tjeurjqb7lCoHy7tpoJueKJeJzygPW9QlwEF0IPZ5A== X-Received: by 2002:a1c:9d09:: with SMTP id g9mr4977771wme.31.1592077310112; Sat, 13 Jun 2020 12:41:50 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:d869:cbcf:2456:40cc]) by smtp.gmail.com with ESMTPSA id a6sm15968918wrn.38.2020.06.13.12.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 12:41:49 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe Date: Sat, 13 Jun 2020 21:41:40 +0200 Message-Id: <20200613194140.10367-2-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200613194140.10367-1-othacehe@gnu.org> References: <20200613194140.10367-1-othacehe@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Build a list of Guix System images. For now, this list only contains the Hurd barebones Guix System image. * gnu/ci.scm (%guixsd-supported-systems): Remove "armhf-linux", (%u-boot-systems): remove unused variable, (%guix-system-images): new variable (qemu-jobs): rename to "image-jobs" and build the Guix Systems listed in the new "%guix-system-images" variable, (system-test-jobs): adapt accordingly, (hydra-jobs): ditto. --- gnu/ci.scm | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index fa67168e22..2d49009810 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -53,6 +53,7 @@ #:use-module (gnu system image) #:use-module (gnu system vm) #:use-module (gnu system install) + #:use-module (gnu system images hurd) #:use-module (gnu tests) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -185,18 +186,21 @@ SYSTEM." (remove (either from-32-to-64? same? pointless?) %cross-targets))) -(define %guixsd-supported-systems - '("x86_64-linux" "i686-linux" "armhf-linux")) +;; Architectures that are able to build or cross-build Guix System images. +;; This does not mean that other architectures are not supported, only that +;; they are often not fast enough to support Guix System images building. +(define %guix-system-supported-systems + '("x86_64-linux" "i686-linux")) -(define %u-boot-systems - '("armhf-linux")) +(define %guix-system-images + (list hurd-barebones-disk-image)) -(define (qemu-jobs store system) - "Return a list of jobs that build QEMU images for SYSTEM." +(define (image-jobs store system) + "Return a list of jobs that build images for SYSTEM." (define (->alist drv) `((derivation . ,(derivation-file-name drv)) - (description . "Stand-alone QEMU image of the GNU system") - (long-description . "This is a demo stand-alone QEMU image of the GNU + (description . "Stand-alone image of the GNU system") + (long-description . "This is a demo stand-alone image of the GNU system.") (license . ,(license-name gpl3+)) (max-silent-time . 600) @@ -211,29 +215,30 @@ system.") (parameterize ((%graft? #f)) (->alist drv)))))) + (define (build-image image) + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (lower-object (system-image image))))) + (define MiB (expt 2 20)) - (if (member system %guixsd-supported-systems) - (list (->job 'usb-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (lower-object - (system-image - (image - (inherit efi-disk-image) - (size (* 1500 MiB)) - (operating-system installation-os))))))) - (->job 'iso9660-image - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (lower-object - (system-image - (image - (inherit iso9660-image) - (operating-system installation-os)))))))) + (if (member system %guix-system-supported-systems) + `(,(->job 'usb-image + (build-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os)))) + ,(->job 'iso9660-image + (build-image + (image + (inherit iso9660-image) + (operating-system installation-os)))) + ,@(map (lambda (image) + (->job (image-name image) (build-image image))) + %guix-system-images)) '())) (define channel-build-system @@ -305,11 +310,7 @@ system.") "." system)))) (cons name (test->thunk test)))) - (if (and (member system %guixsd-supported-systems) - - ;; XXX: Our build farm has too few ARMv7 machines and they are very - ;; slow, so skip system tests there. - (not (string=? system "armhf-linux"))) + (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this @@ -486,7 +487,7 @@ Return #f if no such checkout is found." (package->job store package system)))) (append (filter-map job all) - (qemu-jobs store system) + (image-jobs store system) (system-test-jobs store system #:source source #:commit commit)