aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2022-07-16 16:35:05 +0000
committerPascal Terjan <pterjan@mageia.org>2022-07-16 16:35:05 +0000
commitfbd3511f318d971b179c585cc5dec7a5d0dccb85 (patch)
tree68548e0879cee38a989dc1c2aa1733a570a9bc5a
parent44222e4c2bc7028d63fdf5e5d59059d5ee27241e (diff)
downloadpuppet-fbd3511f318d971b179c585cc5dec7a5d0dccb85.tar
puppet-fbd3511f318d971b179c585cc5dec7a5d0dccb85.tar.gz
puppet-fbd3511f318d971b179c585cc5dec7a5d0dccb85.tar.bz2
puppet-fbd3511f318d971b179c585cc5dec7a5d0dccb85.tar.xz
puppet-fbd3511f318d971b179c585cc5dec7a5d0dccb85.zip
Add a third build on ociaa2 and stop using pktaa1
-rw-r--r--deployment/dns/templates/mageia.org.zone4
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp6
2 files changed, 7 insertions, 3 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index a64e71c9..3897f264 100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -7,7 +7,7 @@
; $Id$
$TTL 30m
@ IN SOA ns0.mageia.org. root.mageia.org. (
- 2022071401 ; Serial
+ 2022071601 ; Serial
7200 ; Refresh
3600 ; Retry
86400 ; Expire
@@ -138,7 +138,9 @@ pktaa1-e IN CNAME pktaa1
pktaa1-f IN CNAME pktaa1
ociaa1-a IN CNAME ociaa1
ociaa1-b IN CNAME ociaa1
+ociaa1-c IN CNAME ociaa1
ociaa2-a IN CNAME ociaa2
ociaa2-b IN CNAME ociaa2
+ociaa2-c IN CNAME ociaa2
<%# vim: set filetype=bindzone : -%>
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index b1984e6e..07cf360b 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -28,8 +28,8 @@ class mga_buildsystem::config {
build_nodes => {
'i586' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ],
'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1', 'rabbit2' ],
- 'armv7hl' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f', 'ociaa1-a', 'ociaa1-b', 'ociaa2-a','ociaa2-b'],
- 'aarch64' => [ 'pktaa1-a', 'pktaa1-b', 'pktaa1-c', 'pktaa1-d', 'pktaa1-e', 'pktaa1-f', 'ociaa1-a', 'ociaa1-b', 'ociaa2-a','ociaa2-b'],
+ 'armv7hl' => [ 'ociaa1-a', 'ociaa1-b', 'ociaa2-a', 'ociaa2-b', 'ociaa2-c'],
+ 'aarch64' => [ 'ociaa1-a', 'ociaa1-b', 'ociaa2-a', 'ociaa2-b', 'ociaa2-c'],
},
build_nodes_aliases => {
'ecosse0' => "ecosse.${::domain}",
@@ -54,8 +54,10 @@ class mga_buildsystem::config {
'pktaa1-f' => "pktaa1.${::domain}",
'ociaa1-a' => "ociaa1.${::domain}",
'ociaa1-b' => "ociaa1.${::domain}",
+ 'ociaa1-c' => "ociaa1.${::domain}",
'ociaa2-a' => "ociaa2.${::domain}",
'ociaa2-b' => "ociaa2.${::domain}",
+ 'ociaa2-c' => "ociaa2.${::domain}",
},
build_src_node => 'duvel',
}