aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-11-26 22:50:36 +0000
committerChristopher Baines <mail@cbaines.net>2023-11-26 22:51:35 +0000
commite79f97289e4f7d0b9c0f91f781f6a7c1bbf8959c (patch)
tree4e21056c23a0e4eaa50ea1bf8c5acc1d662a926e
parent677c18e39874095a47940ace8bf9ad5f92094ffd (diff)
downloadqa-frontpage-e79f97289e4f7d0b9c0f91f781f6a7c1bbf8959c.tar
qa-frontpage-e79f97289e4f7d0b9c0f91f781f6a7c1bbf8959c.tar.gz
Cancel builds before submitting new ones
This should handle the case where we want to cancel a build then submit a new one for the same output.
-rw-r--r--guix-qa-frontpage/manage-builds.scm18
1 files changed, 10 insertions, 8 deletions
diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm
index f5195eb..9276e4f 100644
--- a/guix-qa-frontpage/manage-builds.scm
+++ b/guix-qa-frontpage/manage-builds.scm
@@ -710,6 +710,15 @@
category-name
category-value)
+ ;; Cancel builds first, as some of the builds we want to submit might be
+ ;; for the same outputs as ones we're going to cancel.
+ (cancel-builds-not-for-revision
+ build-coordinator
+ category-name
+ category-value
+ target-commit
+ build-ids-to-keep-set)
+
(if (or (not build-limit)
(< builds-to-submit-count
build-limit))
@@ -728,14 +737,7 @@
(simple-format #t "skipping ~A ~A as too many target derivations (~A)\n"
category-name
category-value
- builds-to-submit-count))
-
- (cancel-builds-not-for-revision
- build-coordinator
- category-name
- category-value
- target-commit
- build-ids-to-keep-set)))
+ builds-to-submit-count))))
(define %system-tests-that-change-every-revision
'("btrfs-raid10-root-os"