summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Whatson <whatson@gmail.com>2021-12-19 16:24:01 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-12-19 16:25:51 +0100
commit11334d15d590073c631c574436d2110aa1ea2142 (patch)
tree71d37ee034f2c998a7de7e03490fc7c4b13aecaa
parent4424fff4dcc7ff987ee7108fff2e4549631563d9 (diff)
downloadguix-11334d15d590073c631c574436d2110aa1ea2142.tar.gz
ci: Restrict substitute search to guix jobset.
* guix/ci.scm (latest-builds): Add jobset keyword.
(find-latest-commit-with-substitutes): Pass jobset "guix".

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
-rw-r--r--guix/ci.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/ci.scm b/guix/ci.scm
index 01b493b3af..88b80f781d 100644
--- a/guix/ci.scm
+++ b/guix/ci.scm
@@ -208,7 +208,7 @@ api-agnostic."
     (map json->build (vector->list queue))))
 
 (define* (latest-builds url #:optional (limit %query-limit)
-                        #:key evaluation system job status)
+                        #:key evaluation system job jobset status)
   "Return the latest builds performed by the CI server at URL.  If EVALUATION
 is an integer, restrict to builds of EVALUATION.  If SYSTEM is true (a system
 string such as \"x86_64-linux\"), restrict to builds for SYSTEM."
@@ -218,6 +218,7 @@ string such as \"x86_64-linux\"), restrict to builds for SYSTEM."
                  `("evaluation" ,evaluation)
                  `("system" ,system)
                  `("job" ,job)
+                 `("jobset" ,jobset)
                  `("status" ,status))))
     ;; Note: Hydra does not provide a "derivation" field for entries in
     ;; 'latestbuilds', but Cuirass does.
@@ -286,6 +287,7 @@ definitions at URL.  Return false if no commit were found."
   (let* ((job-name (string-append "guix." (%current-system)))
          (build (match (latest-builds url 1
                                       #:job job-name
+                                      #:jobset "guix"
                                       #:status 0) ;success
                   ((build) build)
                   (_ #f)))