me/guix
Archived
1
0
Fork 0
Code Activity

service: cuirass: Update it.

Browse source
This commit is contained in:
Mathieu Othacehe 2021-01-15 17:10:41 +01:00
parent ec145a2ff9
commit 0f01493dc8
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 40 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/ci.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
@ -26,6 +26,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
@ -68,8 +69,8 @@
(file-name (string-append name "-" version "-checkout"))))))) (file-name (string-append name "-" version "-checkout")))))))
(define-public cuirass (define-public cuirass
(let ((commit "697fa14584551d9595cd042f1ffeba240e45a127") (let ((commit "da6a5c0355e72d725003c9005a9974f2a476d999")
(revision "56")) (revision "58"))
(package (package
(name "cuirass") (name "cuirass")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -81,43 +82,33 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m")))) "0p9ad0aisbl7clb3vi7zmfbnmnsnxq90vgx8v9ly5b0dgrav91p4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:modules ((guix build utils) '(#:modules ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
#:tests? #f ;requires a PostgreSQL database.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-repo-tests
(lambda _
;; Disable tests that use a connection to the Guix daemon.
(substitute* "Makefile.am"
(("tests/repo.scm \\\\") "\\"))
#t))
(add-after 'disable-repo-tests 'patch-/bin/sh
(lambda _
(substitute* "build-aux/git-version-gen"
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules. ;; Wrap the 'cuirass' command to refer to the right modules.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt")) (gcrypt (assoc-ref inputs "guile-gcrypt"))
(json (assoc-ref inputs "guile-json")) (json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3")) (zmq (assoc-ref inputs "guile-simple-zmq"))
(squee (assoc-ref inputs "guile-squee"))
(git (assoc-ref inputs "guile-git")) (git (assoc-ref inputs "guile-git"))
(bytes (assoc-ref inputs "guile-bytestructures")) (bytes (assoc-ref inputs "guile-bytestructures"))
(fibers (assoc-ref inputs "guile-fibers")) (fibers (assoc-ref inputs "guile-fibers"))
(zlib (assoc-ref inputs "guile-zlib")) (zlib (assoc-ref inputs "guile-zlib"))
(guix (assoc-ref inputs "guix")) (guix (assoc-ref inputs "guix"))
(deps (list gcrypt json sqlite git bytes fibers (deps (list avahi gcrypt json zmq squee git bytes
zlib guix)) fibers zlib guix))
(guile (assoc-ref %build-inputs "guile")) (guile (assoc-ref %build-inputs "guile"))
(effective (read-line (effective (read-line
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
@ -137,17 +128,22 @@
1))) 1)))
;; Make sure 'cuirass' can find the 'evaluate' command, as ;; Make sure 'cuirass' can find the 'evaluate' command, as
;; well as the relevant Guile modules. ;; well as the relevant Guile modules.
(wrap-program (string-append out "/bin/cuirass") (for-each
`("PATH" ":" prefix (,(string-append out "/bin"))) (lambda (name)
`("GUILE_LOAD_PATH" ":" prefix (,mods)) (wrap-program (string-append out "/bin/" name)
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) `("PATH" ":" prefix (,(string-append out "/bin")))
`("GUILE_LOAD_PATH" ":" prefix (,mods))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))
'("cuirass" "remote-server" "remote-worker"))
#t)))))) #t))))))
(inputs (inputs
`(("guile" ,guile-3.0/libgc-7) `(("guile" ,guile-3.0/libgc-7)
("guile-avahi" ,guile-avahi)
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4) ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3-dev) ("guile-simple-zmq" ,guile-simple-zmq)
("guile-squee" ,guile-squee)
("guile-git" ,guile-git) ("guile-git" ,guile-git)
("guile-zlib" ,guile-zlib) ("guile-zlib" ,guile-zlib)
;; FIXME: this is propagated by "guile-git", but it needs to be among ;; FIXME: this is propagated by "guile-git", but it needs to be among

74
gnu/services/cuirass.scm
View file

@ -29,6 +29,7 @@
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services databases)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services admin) #:use-module (gnu services admin)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
@ -54,11 +55,6 @@
(default "/var/log/cuirass.log")) (default "/var/log/cuirass.log"))
(web-log-file cuirass-configuration-web-log-file ;string (web-log-file cuirass-configuration-web-log-file ;string
(default "/var/log/cuirass-web.log")) (default "/var/log/cuirass-web.log"))
(queries-log-file cuirass-configuration-queries-log-file ;string
(default #f))
(web-queries-log-file
cuirass-configuration-web-queries-log-file ;string
(default #f))
(cache-directory cuirass-configuration-cache-directory ;string (dir-name) (cache-directory cuirass-configuration-cache-directory ;string (dir-name)
(default "/var/cache/cuirass")) (default "/var/cache/cuirass"))
(ttl cuirass-configuration-ttl ;integer (ttl cuirass-configuration-ttl ;integer
@ -69,10 +65,8 @@
(default "cuirass")) (default "cuirass"))
(interval cuirass-configuration-interval ;integer (seconds) (interval cuirass-configuration-interval ;integer (seconds)
(default 60)) (default 60))
(queue-size cuirass-configuration-queue-size (database cuirass-configuration-database ;string
(default 1)) (default "dbname=cuirass host=/var/run/postgresql"))
(database cuirass-configuration-database ;string (file-name)
(default "/var/lib/cuirass/cuirass.db"))
(port cuirass-configuration-port ;integer (port) (port cuirass-configuration-port ;integer (port)
(default 8081)) (default 8081))
(host cuirass-configuration-host ;string (host cuirass-configuration-host ;string
@ -94,13 +88,9 @@
(cache-directory (cuirass-configuration-cache-directory config)) (cache-directory (cuirass-configuration-cache-directory config))
(web-log-file (cuirass-configuration-web-log-file config)) (web-log-file (cuirass-configuration-web-log-file config))
(log-file (cuirass-configuration-log-file config)) (log-file (cuirass-configuration-log-file config))
(queries-log-file (cuirass-configuration-queries-log-file config))
(web-queries-log-file
(cuirass-configuration-web-queries-log-file config))
(user (cuirass-configuration-user config)) (user (cuirass-configuration-user config))
(group (cuirass-configuration-group config)) (group (cuirass-configuration-group config))
(interval (cuirass-configuration-interval config)) (interval (cuirass-configuration-interval config))
(queue-size (cuirass-configuration-queue-size config))
(database (cuirass-configuration-database config)) (database (cuirass-configuration-database config))
(ttl (cuirass-configuration-ttl config)) (ttl (cuirass-configuration-ttl config))
(port (cuirass-configuration-port config)) (port (cuirass-configuration-port config))
@ -113,7 +103,7 @@
(list (shepherd-service (list (shepherd-service
(documentation "Run Cuirass.") (documentation "Run Cuirass.")
(provision '(cuirass)) (provision '(cuirass))
(requirement '(guix-daemon networking)) (requirement '(guix-daemon postgres networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"--cache-directory" #$cache-directory "--cache-directory" #$cache-directory
@ -122,11 +112,6 @@
"--database" #$database "--database" #$database
"--ttl" #$(string-append (number->string ttl) "s") "--ttl" #$(string-append (number->string ttl) "s")
"--interval" #$(number->string interval) "--interval" #$(number->string interval)
"--queue-size" #$(number->string queue-size)
#$@(if queries-log-file
(list (string-append "--log-queries="
queries-log-file))
'())
#$@(if use-substitutes? '("--use-substitutes") '()) #$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '()) #$@(if one-shot? '("--one-shot") '())
#$@(if fallback? '("--fallback") '()) #$@(if fallback? '("--fallback") '())
@ -144,22 +129,16 @@
(shepherd-service (shepherd-service
(documentation "Run Cuirass web interface.") (documentation "Run Cuirass web interface.")
(provision '(cuirass-web)) (provision '(cuirass-web))
(requirement '(guix-daemon networking)) (requirement '(guix-daemon postgres networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$cuirass "/bin/cuirass") (list (string-append #$cuirass "/bin/cuirass")
"--cache-directory" #$cache-directory "--cache-directory" #$cache-directory
"--specifications"
#$(scheme-file "cuirass-specs.scm" specs)
"--database" #$database "--database" #$database
"--ttl" #$(string-append (number->string ttl) "s") "--ttl" #$(string-append (number->string ttl) "s")
"--web" "--web"
"--port" #$(number->string port) "--port" #$(number->string port)
"--listen" #$host "--listen" #$host
"--interval" #$(number->string interval) "--interval" #$(number->string interval)
#$@(if web-queries-log-file
(list (string-append "--log-queries="
web-queries-log-file))
'())
#$@(if use-substitutes? '("--use-substitutes") '()) #$@(if use-substitutes? '("--use-substitutes") '())
#$@(if fallback? '("--fallback") '()) #$@(if fallback? '("--fallback") '())
#$@extra-options) #$@extra-options)
@ -184,15 +163,18 @@
(home-directory (string-append "/var/lib/" cuirass-user)) (home-directory (string-append "/var/lib/" cuirass-user))
(shell (file-append shadow "/sbin/nologin")))))) (shell (file-append shadow "/sbin/nologin"))))))
(define (cuirass-postgresql-role config)
(let ((user (cuirass-configuration-user config)))
(list (postgresql-role
(name user)
(create-database? #t)))))
(define (cuirass-activation config) (define (cuirass-activation config)
"Return the activation code for CONFIG." "Return the activation code for CONFIG."
(let ((cache (cuirass-configuration-cache-directory config)) (let ((cache (cuirass-configuration-cache-directory config))
(db (dirname (cuirass-configuration-database config))) (db (dirname (cuirass-configuration-database config)))
(user (cuirass-configuration-user config)) (user (cuirass-configuration-user config))
(log "/var/log/cuirass") (log "/var/log/cuirass")
(queries-log-file (cuirass-configuration-queries-log-file config))
(web-queries-log-file
(cuirass-configuration-web-queries-log-file config))
(group (cuirass-configuration-group config))) (group (cuirass-configuration-group config)))
(with-imported-modules '((guix build utils)) (with-imported-modules '((guix build utils))
#~(begin #~(begin
@ -206,33 +188,14 @@
(gid (group:gid (getgr #$group)))) (gid (group:gid (getgr #$group))))
(chown #$cache uid gid) (chown #$cache uid gid)
(chown #$db uid gid) (chown #$db uid gid)
(chown #$log uid gid) (chown #$log uid gid))))))
(let ((queries-log-file #$queries-log-file))
(when queries-log-file
(call-with-output-file queries-log-file (const #t))
(chown #$queries-log-file uid gid)))
(let ((web-queries-log-file #$web-queries-log-file))
(when web-queries-log-file
(call-with-output-file web-queries-log-file (const #t))
(chown web-queries-log-file uid gid))))))))
(define (cuirass-log-rotations config) (define (cuirass-log-rotations config)
"Return the list of log rotations that corresponds to CONFIG." "Return the list of log rotations that corresponds to CONFIG."
(let ((queries-log-file (cuirass-configuration-queries-log-file config)) (list (log-rotation
(web-queries-log-file (files (list (cuirass-configuration-log-file config)))
(cuirass-configuration-web-queries-log-file config))) (frequency 'weekly)
(list (log-rotation (options '("rotate 40"))))) ;worth keeping
(files `(,(cuirass-configuration-log-file config)
,@(if queries-log-file
(list queries-log-file)
'())
,@(if web-queries-log-file
(list web-queries-log-file)
'())))
(frequency 'weekly)
(options '("rotate 40")))))) ;worth keeping
(define cuirass-service-type (define cuirass-service-type
(service-type (service-type
@ -244,7 +207,8 @@
(service-extension rottlog-service-type cuirass-log-rotations) (service-extension rottlog-service-type cuirass-log-rotations)
(service-extension activation-service-type cuirass-activation) (service-extension activation-service-type cuirass-activation)
(service-extension shepherd-root-service-type cuirass-shepherd-service) (service-extension shepherd-root-service-type cuirass-shepherd-service)
(service-extension account-service-type cuirass-account))) (service-extension account-service-type cuirass-account)
(service-extension postgresql-role-service-type
cuirass-postgresql-role)))
(description (description
"Run the Cuirass continuous integration service."))) "Run the Cuirass continuous integration service.")))