[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: sysadmin/services: Use cuirass with disabled fibers tests.
From: |
Ricardo Wurmus |
Subject: |
02/03: sysadmin/services: Use cuirass with disabled fibers tests. |
Date: |
Fri, 6 Mar 2020 11:32:31 -0500 (EST) |
rekado pushed a commit to branch master
in repository maintenance.
commit 1d8c25fdf7f2bc95d02611dfcac8442279d94806
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Fri Mar 6 17:30:48 2020 +0100
sysadmin/services: Use cuirass with disabled fibers tests.
* hydra/modules/sysadmin/services.scm (cuirass-without-fiber-tests):
New variable.
(frontend-services)[services]: Use it.
---
hydra/modules/sysadmin/services.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/hydra/modules/sysadmin/services.scm
b/hydra/modules/sysadmin/services.scm
index c4f4c4f..3323efa 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -1,7 +1,7 @@
;;; GNU Guix system administration tools.
;;;
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <address@hidden>
-;;; Copyright © 2017, 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017, 2018, 2020 Ricardo Wurmus <address@hidden>
;;;
;;; This program is free software: you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@
#:use-module (gnu services shepherd)
#:use-module (gnu services ssh)
#:use-module (gnu services web)
+ #:use-module (guix packages)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages ci)
+ #:use-module (gnu packages guile-xyz)
#:use-module (gnu packages linux)
#:use-module (gnu packages package-management)
#:use-module (gnu packages tls)
@@ -250,6 +254,17 @@
(plain-file "motd"
"Welcome to the Guix build frontend!\n\n"))
+(define cuirass-without-fiber-tests
+ (package
+ (inherit cuirass)
+ (inputs
+ `(("guile-fibers"
+ ,(package (inherit guile-fibers)
+ (arguments
+ `(#:tests? #f
+ ,@(package-arguments guile-fibers)))))
+ ,@(alist-delete "guile-fibers" (package-inputs cuirass))))))
+
(define* (frontend-services sysadmins #:key
nginx-config-file
(max-jobs 5)
@@ -280,6 +295,7 @@
(service cuirass-service-type
(cuirass-configuration
+ (cuirass cuirass-without-fiber-tests)
(interval (* 5 60))
(ttl (quotient nar-ttl 2))
(specifications (cuirass-specs systems))))