diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/cuirass.scm | 22 | ||||
| -rw-r--r-- | gnu/tests/cuirass.scm | 33 |
2 files changed, 20 insertions, 35 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 18163b59e2..b962f2f80a 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -60,8 +60,7 @@ simple-cuirass-configuration simple-cuirass-configuration? - %default-cuirass-config - simple-cuirass-services)) + simple-cuirass-configuration->specs)) ;;;; Commentary: ;;; @@ -419,13 +418,7 @@ CONFIG." (systems simple-cuirass-configuration-systems (default (list (%current-system))))) ;list of strings -(define %default-cuirass-config - (cuirass-configuration - (specifications #~()))) - -(define* (simple-cuirass-services config - #:optional - (cuirass %default-cuirass-config)) +(define* (simple-cuirass-configuration->specs config) (define (format-name name) (if (string? name) name @@ -475,13 +468,4 @@ CONFIG." (#:build-outputs . ()) (#:priority . 1)))) - (list - (service cuirass-service-type - (cuirass-configuration - (inherit cuirass) - (specifications #~(list - '#$(config->spec config))))) - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-10))) - (service postgresql-role-service-type))) + #~(list '#$(config->spec config))) diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 22eab3c456..e833a047ad 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -132,11 +132,7 @@ (remote-server (and remote-build? (cuirass-remote-server-configuration))) (host "0.0.0.0") - (use-substitutes? #t))) - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-10))) - (service postgresql-role-service-type))) + (use-substitutes? #t))))) (define (run-cuirass-test name os) (define os* @@ -286,6 +282,20 @@ (description "Connect to a Cuirass server with remote build.") (value (run-cuirass-test name os))))) +(define simple-cuirass-service + (service cuirass-service-type + (cuirass-configuration + (specifications + (simple-cuirass-configuration->specs + (simple-cuirass-configuration + (build 'all) + (channels + (list (channel + (name 'guix) + (url "file:///tmp/cuirass-main/"))))))) + (host "0.0.0.0") + (use-substitutes? #t)))) + (define %cuirass-simple-test (let ((os (operating-system (inherit %simple-os) @@ -293,17 +303,8 @@ (append (list cow-service (service dhcp-client-service-type) - git-service) - (simple-cuirass-services - (simple-cuirass-configuration - (build 'all) - (channels (list (channel - (name 'guix) - (url "file:///tmp/cuirass-main/"))))) - (cuirass-configuration - (inherit %default-cuirass-config) - (host "0.0.0.0") - (use-substitutes? #t))) + git-service + simple-cuirass-service) (operating-system-user-services %simple-os)))))) (system-test (name "cuirass-simple") |