[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: hydra: Enable data.qa.guix. substitutes for bordeaux build machin
|
From: |
Christopher Baines |
|
Subject: |
03/03: hydra: Enable data.qa.guix. substitutes for bordeaux build machines. |
|
Date: |
Wed, 2 Mar 2022 14:13:57 -0500 (EST) |
cbaines pushed a commit to branch master
in repository maintenance.
commit 48c3c013ac4289c4e8c9050ec18469843b15f599
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Mar 2 19:10:54 2022 +0000
hydra: Enable data.qa.guix. substitutes for bordeaux build machines.
This is a step towards building non-master branch derivations using
the build coordinator instance behind bordeaux.guix.gnu.org.
Since data.guix.gnu.org only provides derivations for the master
branch (and it's easier operationally to keep this limitation),
there's a second data service instance (data.qa.guix.gnu.org) which
processes all branches. This commit enables substitutes from that
second QA data service instance.
---
hydra/bayfront.scm | 4 +++-
hydra/harbourfront.scm | 6 ++++--
hydra/hatysa.scm | 6 ++++--
hydra/keys/guix/data.qa.guix.gnu.org.pub | 6 ++++++
hydra/milano-guix-1.scm | 6 ++++--
hydra/monokuma.scm | 6 ++++--
6 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index d96d8fd..f680921 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -1067,7 +1067,8 @@ access_log /var/log/nginx/bordeaux.access.log;"))
(max-1min-load-average 8)
(systems '("x86_64-linux" "i686-linux"))
(derivation-substitute-urls
- (list "https://data.guix.gnu.org";))
+ (list "https://data.guix.gnu.org";
+ "https://data.qa.guix.gnu.org";))
(non-derivation-substitute-urls
(list "https://bordeaux.guix.gnu.org";))))
@@ -1082,6 +1083,7 @@ access_log /var/log/nginx/bordeaux.access.log;"))
(cons*
(local-file "keys/guix/bordeaux.guix.gnu.org-export.pub")
(local-file "keys/guix/data.guix.gnu.org.pub")
+ (local-file "keys/guix/data.qa.guix.gnu.org.pub")
%build-node-keys))
(max-silent-time (* 12 3600))
diff --git a/hydra/harbourfront.scm b/hydra/harbourfront.scm
index 6a2e2cc..9dfa65b 100644
--- a/hydra/harbourfront.scm
+++ b/hydra/harbourfront.scm
@@ -89,7 +89,8 @@
(max-1min-load-average 8)
(systems '("x86_64-linux" "i686-linux"))
(derivation-substitute-urls
- (list "https://data.guix.gnu.org";))
+ (list "https://data.guix.gnu.org";
+ "https://data.qa.guix.gnu.org";))
(non-derivation-substitute-urls
(list "https://bordeaux.guix.gnu.org";))))
@@ -105,4 +106,5 @@
(authorized-keys
(list
(local-file
"keys/guix/bordeaux.guix.gnu.org-export.pub")
- (local-file
"keys/guix/data.guix.gnu.org.pub")))))))))
+ (local-file
"keys/guix/data.guix.gnu.org.pub")
+ (local-file
"keys/guix/data.qa.guix.gnu.org.pub")))))))))
diff --git a/hydra/hatysa.scm b/hydra/hatysa.scm
index 8346546..fb60766 100644
--- a/hydra/hatysa.scm
+++ b/hydra/hatysa.scm
@@ -161,7 +161,8 @@
(max-parallel-builds 8)
(systems '("aarch64-linux" "armhf-linux"))
(derivation-substitute-urls
- (list "https://data.guix.gnu.org";))
+ (list "https://data.guix.gnu.org";
+ "https://data.qa.guix.gnu.org";))
(non-derivation-substitute-urls
(list "https://bordeaux.guix.gnu.org";))))
@@ -185,4 +186,5 @@
(authorized-keys
(list
(local-file
"keys/guix/bordeaux.guix.gnu.org-export.pub")
- (local-file
"keys/guix/data.guix.gnu.org.pub")))))))))
+ (local-file "keys/guix/data.guix.gnu.org.pub")
+ (local-file
"keys/guix/data.qa.guix.gnu.org.pub")))))))))
diff --git a/hydra/keys/guix/data.qa.guix.gnu.org.pub
b/hydra/keys/guix/data.qa.guix.gnu.org.pub
new file mode 100644
index 0000000..f771708
--- /dev/null
+++ b/hydra/keys/guix/data.qa.guix.gnu.org.pub
@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+ (curve Ed25519)
+ (q #50349E83123851A65A569304A12E512B698223A81E10BEEC5A3E56EDAEE5DAC1#)
+ )
+ )
diff --git a/hydra/milano-guix-1.scm b/hydra/milano-guix-1.scm
index 2b9898a..b1bcd2b 100644
--- a/hydra/milano-guix-1.scm
+++ b/hydra/milano-guix-1.scm
@@ -140,7 +140,8 @@
(max-1min-load-average 32)
(systems '("x86_64-linux" "i686-linux"))
(derivation-substitute-urls
- (list "https://data.guix.gnu.org";))
+ (list "https://data.guix.gnu.org";
+ "https://data.qa.guix.gnu.org";))
(non-derivation-substitute-urls
(list "https://bordeaux.guix.gnu.org";)))))
@@ -161,4 +162,5 @@
(authorized-keys
(list
(local-file
"keys/guix/bordeaux.guix.gnu.org-export.pub")
- (local-file
"keys/guix/data.guix.gnu.org.pub")))))))))
+ (local-file "keys/guix/data.guix.gnu.org.pub")
+ (local-file
"keys/guix/data.qa.guix.gnu.org.pub")))))))))
diff --git a/hydra/monokuma.scm b/hydra/monokuma.scm
index 0fc2ebc..7809073 100644
--- a/hydra/monokuma.scm
+++ b/hydra/monokuma.scm
@@ -99,7 +99,8 @@
(max-parallel-builds 4)
(systems '("aarch64-linux" "armhf-linux"))
(derivation-substitute-urls
- (list "https://data.guix.gnu.org";))
+ (list "https://data.guix.gnu.org";
+ "https://data.qa.guix.gnu.org";))
(non-derivation-substitute-urls
(list "https://bordeaux.guix.gnu.org";))))
@@ -118,7 +119,8 @@
(list
(local-file
"keys/guix/bordeaux.guix.gnu.org-export.pub")
- (local-file
"keys/guix/data.guix.gnu.org.pub")))
+ (local-file
"keys/guix/data.guix.gnu.org.pub")
+ (local-file
"keys/guix/data.qa.guix.gnu.org.pub")))
(extra-options
'("--max-jobs=4")))))))