From patchwork Fri Jul 5 12:32:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 65935 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 50FA827BBEA; Fri, 5 Jul 2024 13:34:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EFF027BBE2 for ; Fri, 5 Jul 2024 13:34:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPi8i-0007gG-CT; Fri, 05 Jul 2024 08:34:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPi8a-0007Z4-Uc for guix-patches@gnu.org; Fri, 05 Jul 2024 08:34:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPi8Z-0008H8-8U; Fri, 05 Jul 2024 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPi8Y-0005gb-IM; Fri, 05 Jul 2024 08:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71947] [PATCH 1/2] services: guix-build-coordinator-agent: Remove defaults. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71947@debbugs.gnu.org Cc: Andreas Enge , Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 71947-submit@debbugs.gnu.org id=B71947.172018279421776 (code B ref 71947); Fri, 05 Jul 2024 12:34:02 +0000 Received: (at 71947) by debbugs.gnu.org; 5 Jul 2024 12:33:14 +0000 Received: from localhost ([127.0.0.1]:43717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPi7m-0005f9-47 for submit@debbugs.gnu.org; Fri, 05 Jul 2024 08:33:14 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:42186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPi7k-0005ex-M5 for 71947@debbugs.gnu.org; Fri, 05 Jul 2024 08:33:13 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9FBB4DCF; Fri, 5 Jul 2024 14:33:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6YfXnncW0VqS; Fri, 5 Jul 2024 14:33:03 +0200 (CEST) Received: from jurong.bordeaux.inria.fr (nat-eduroam-36-gw-01-bso.bordeaux.inria.fr [194.199.1.36]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E2BC315F; Fri, 5 Jul 2024 14:33:02 +0200 (CEST) From: Andreas Enge Date: Fri, 5 Jul 2024 14:32:52 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/guix.scm () [max-parallel-builds, max-parallel-uploads]: Set default to #f. (guix-build-coordinator-agent-shepherd-services): Check for max-parallel-builds. * doc/guix.texi (Guix Services): Adapt the documentation. If set to #f, the default values are now taken as the defaults of the guix-build-coordinator-agent command. Change-Id: Ide6dde0e88aa0dc851b6295095f414ca2ddc72ac --- doc/guix.texi | 6 +++--- gnu/services/guix.scm | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7d0824784d..d4d00fd4b8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23,7 +23,7 @@ @copying Copyright @copyright{} 2012-2024 Ludovic Courtès@* -Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* +Copyright @copyright{} 2013, 2014, 2016, 2024 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* @@ -39656,10 +39656,10 @@ Guix Services The systems for which this agent should fetch builds. The agent process will use the current system it's running on as the default. -@item @code{max-parallel-builds} (default: @code{1}) +@item @code{max-parallel-builds} (default: @code{#f}) The number of builds to perform in parallel. -@item @code{max-parallel-uploads} (default: @code{1}) +@item @code{max-parallel-uploads} (default: @code{#f}) The number of uploads to perform in parallel. @item @code{max-allocated-builds} (default: @code{#f}) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 0182c21ea7..fdeaeeb472 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -194,10 +194,10 @@ (define-record-type* (default #f)) (max-parallel-builds guix-build-coordinator-agent-configuration-max-parallel-builds - (default 1)) + (default #f)) (max-parallel-uploads guix-build-coordinator-agent-configuration-max-parallel-uploads - (default 1)) + (default #f)) (max-allocated-builds guix-build-coordinator-agent-configuration-max-allocated-builds (default #f)) @@ -443,8 +443,10 @@ (define (guix-build-coordinator-agent-shepherd-services config) #~(#$(string-append "--name=" agent-name) #$(string-append "--dynamic-auth-token-file=" token-file)))) - #$(simple-format #f "--max-parallel-builds=~A" - max-parallel-builds) + #$@(if max-parallel-builds + #~(#$(simple-format #f "--max-parallel-builds=~A" + max-parallel-builds)) + #~()) #$@(if max-parallel-uploads #~(#$(simple-format #f "--max-parallel-uploads=~A" max-parallel-uploads)) From patchwork Fri Jul 5 12:32:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 65936 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 72C8227BBEA; Fri, 5 Jul 2024 13:34:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C125F27BBE2 for ; Fri, 5 Jul 2024 13:34:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPi8h-0007e2-QM; Fri, 05 Jul 2024 08:34:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPi8a-0007Z6-Uc for guix-patches@gnu.org; Fri, 05 Jul 2024 08:34:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPi8Z-0008H5-Dl; Fri, 05 Jul 2024 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPi8Z-0005gh-17; Fri, 05 Jul 2024 08:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71947] [PATCH 2/2] services: guix-build-coordinator-agent: Add extra-options. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71947@debbugs.gnu.org Cc: Andreas Enge , Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 71947-submit@debbugs.gnu.org id=B71947.172018282821834 (code B ref 71947); Fri, 05 Jul 2024 12:34:02 +0000 Received: (at 71947) by debbugs.gnu.org; 5 Jul 2024 12:33:48 +0000 Received: from localhost ([127.0.0.1]:43720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPi8J-0005g5-Ia for submit@debbugs.gnu.org; Fri, 05 Jul 2024 08:33:47 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:36542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPi8H-0005fq-NL for 71947@debbugs.gnu.org; Fri, 05 Jul 2024 08:33:46 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 414B01057; Fri, 5 Jul 2024 14:33:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 65_XeuoD0Q9T; Fri, 5 Jul 2024 14:33:06 +0200 (CEST) Received: from jurong.bordeaux.inria.fr (nat-eduroam-36-gw-01-bso.bordeaux.inria.fr [194.199.1.36]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 94BA515F; Fri, 5 Jul 2024 14:33:06 +0200 (CEST) From: Andreas Enge Date: Fri, 5 Jul 2024 14:32:53 +0200 Message-ID: <85cae78febb3d22547365e4ed3b2d77308927e89.1720182298.git.andreas@enge.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/guix.scm (): Add field extra-options. (guix-build-coordinator-agent-shepherd-services): Add and use EXTRA-OPTIONS argument. * doc/guix.texi (Guix Services): Adapt the documentation. Change-Id: I9e7e258e03e2b6553aa1570f5fcfaf3b0ada3e15 --- doc/guix.texi | 2 ++ gnu/services/guix.scm | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index d4d00fd4b8..8bfb342253 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39682,6 +39682,8 @@ Guix Services URLs from which to attempt to fetch substitutes for build inputs, if the input store items aren't already available. +@item @code{extra-options} (default: @var{'()}) +Extra command line options for @code{guix-build-coordinator-agent}. @end table @end deftp diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index fdeaeeb472..6c58b3a292 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -66,6 +66,7 @@ (define-module (gnu services guix) guix-build-coordinator-agent-configuration-max-1min-load-average guix-build-coordinator-agent-configuration-derivation-substitute-urls guix-build-coordinator-agent-configuration-non-derivation-substitute-urls + guix-build-coordinator-agent-configuration-extra-options guix-build-coordinator-agent-password-auth guix-build-coordinator-agent-password-auth? @@ -209,7 +210,10 @@ (define-record-type* (default #f)) (non-derivation-substitute-urls guix-build-coordinator-agent-configuration-non-derivation-substitute-urls - (default #f))) + (default #f)) + (extra-options + guix-build-coordinator-agent-configuration-extra-options + (default '()))) (define-record-type* guix-build-coordinator-agent-password-auth @@ -410,6 +414,7 @@ (define (guix-build-coordinator-agent-shepherd-services config) max-parallel-builds max-parallel-uploads max-allocated-builds max-1min-load-average derivation-substitute-urls non-derivation-substitute-urls + extra-options systems) (list (shepherd-service @@ -469,6 +474,7 @@ (define (guix-build-coordinator-agent-shepherd-services config) "--non-derivation-substitute-urls=" (string-join non-derivation-substitute-urls " "))) #~()) + #$@extra-options #$@(map (lambda (system) (string-append "--system=" system)) (or systems '())))