From patchwork Mon Apr 8 17:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 62854 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 F174327BBE9; Mon, 8 Apr 2024 18:57:05 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 34ABD27BBEA for ; Mon, 8 Apr 2024 18:57:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rttDo-0005eQ-V1; Mon, 08 Apr 2024 13:55:57 -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 1rttDn-0005co-FP for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -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 1rttDm-0004qD-Vx for guix-patches@gnu.org; Mon, 08 Apr 2024 13:55:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rttDu-0001MM-EY for guix-patches@gnu.org; Mon, 08 Apr 2024 13:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70285] [PATCH 1/3] services: cuirass: Use separate extra options for cuirass web process. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70285@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 70285-submit@debbugs.gnu.org id=B70285.17125989365120 (code B ref 70285); Mon, 08 Apr 2024 17:56:02 +0000 Received: (at 70285) by debbugs.gnu.org; 8 Apr 2024 17:55:36 +0000 Received: from localhost ([127.0.0.1]:47578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDU-0001KV-7o for submit@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:36 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:46306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rttDQ-0001Jt-TY for 70285@debbugs.gnu.org; Mon, 08 Apr 2024 13:55:34 -0400 Received: from localhost.localdomain (bba-86-99-90-22.alshamil.net.ae [86.99.90.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 2EE1C7960; Mon, 8 Apr 2024 17:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1712598919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sb64CWlROvHmKaoZWB0bskaJQvi1lCDCUNaMj4HvSeo=; b=AFKeNRW4r5L8Rk0FJKJhnBrF+c9FiMrrzB8YB4Wgq/o5myuDRI5Bl5WC1spr338Yhq5N7v qEf7VdOOR2253dr14Rr7tNGtpalNfpZctQbE0P9XDI0PJ7NR3iF68S87rG8Y4cmEugJibO r1R1iXLHgWqyGnh6GsJG71sEkXQfU/y4oM/sWFCgEatzacKzmu+zxnwi1HuFMhKVx6kDMw ZrJevwrRitdCkKN+WwgPrqEQA7QoaHb6tQBVWYsjX+yABavwW4X7KIdp58SloL8pJ92kwM imIPe8D8GE03pIqKd0Lo3dSeB2WQ6+9Qxi8kFR71CNp1D5+TFLAj2P+F1SLoaNfUQhfvK6 MZRqsxlmwwYUV/JNRyuQeYtYqw6HvKWG+4U+7WIts+k3TtduJ6j8g8QC9cSm2WhSAN8/Ed rVJa58CAPyDBrrphhWEqDHUD6rdPyyJ/NjVyBsC0aROJiMDhm/QbSkJpHpUlollmhd8ePA hS1lnJtaMFg/0w7BEnBwoQEP10zg1qLXFCGPGP1QTU/uVvU2aO0j//td2t9DWC9oAJqE4A B8lOGSefLaEkW/1FrP6/pDzcpJgO5SFB9TvdcEFPjB6uSZM2SUYF6XPPtONypdBKjJHgGa sF+BbjHXTD0Hz80DfD6ftmQ6RTlg5J+gYvljQMi7ZU352vs1o0btk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1712598919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sb64CWlROvHmKaoZWB0bskaJQvi1lCDCUNaMj4HvSeo=; b=+wNWqG4O2yNmyhHNMEU4R3BBh01xNuqwndlhv6vfkvhZO1b2xbH4TVpfa0xdpAD58wtnAR yFg2gIkPh0QunODg== Date: Mon, 8 Apr 2024 21:54:12 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 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: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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 Currently, "extra-options" is passed to both "cuirass register" and "cuirass web" processes. This makes it impractical since the extra parameters have to be intended for and supported by both processes. * gnu/services/cuirass.scm (): Add a web-extra-options field. (cuirass-shepherd-service): Replace extra-options with web-extra-options for cuirass web. * doc/guix.texi (Continuous Integration): Document the changes. Change-Id: Iba79c559ea8267aaf8f25248f3d18ed7b352cb60 --- doc/guix.texi | 5 ++++- gnu/services/cuirass.scm | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5827e0de14..77e17cb69c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34406,7 +34406,10 @@ Continuous Integration packages locally. @item @code{extra-options} (default: @code{'()}) -Extra options to pass when running the Cuirass processes. +Extra options to pass when running the @code{cuirass register} process. + +@item @code{web-extra-options} (default: @code{'()}) +Extra options to pass when running the @code{cuirass web} process. @end table @end deftp diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index bcdbffa2f3..b09d5601d4 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -120,6 +120,8 @@ (define-record-type* (fallback? cuirass-configuration-fallback? ;boolean (default #f)) (extra-options cuirass-configuration-extra-options + (default '())) + (web-extra-options cuirass-configuration-web-extra-options (default '()))) (define (cuirass-shepherd-service config) @@ -142,7 +144,8 @@ (define (cuirass-shepherd-service config) (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) - (extra-options (cuirass-configuration-extra-options config))) + (extra-options (cuirass-configuration-extra-options config)) + (web-extra-options (cuirass-configuration-web-extra-options config))) `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) @@ -192,7 +195,7 @@ (define (cuirass-shepherd-service config) "--parameters=" parameters)) '()) - #$@extra-options) + #$@web-extra-options) #:user #$user #:group #$group