From 4b2026b6c8129dc002c1eaf7b4b490c35b8ea200 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Sun, 12 Jan 2020 21:41:31 +0000 Subject: Switch almost all arm builds to Amazon This includes dropping armv5tl --- deployment/dns/templates/mageia.org.zone | 4 +++- deployment/mga_buildsystem/manifests/config.pp | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'deployment') diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 11c46d82..8059114b 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. ( - 2020010702 ; Serial + 2020011201 ; Serial 7200 ; Refresh 3600 ; Retry 86400 ; Expire @@ -131,5 +131,7 @@ ec2aa1-a IN CNAME ec2aa1 ec2aa1-b IN CNAME ec2aa1 ec2aa2-a IN CNAME ec2aa2 ec2aa2-b IN CNAME ec2aa2 +ec2aa3-a IN CNAME ec2aa3 +ec2aa3-b IN CNAME ec2aa3 <%# vim: set filetype=bindzone : -%> diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 1a9af791..c0b5da2d 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -28,9 +28,8 @@ class mga_buildsystem::config { build_nodes => { 'i586' => [ 'ecosse0', 'rabbit0', 'scwx861', 'ecosse1', 'rabbit1', 'scwx862', 'rabbit2', 'scwx863' ], 'x86_64' => [ 'rabbit0', 'ecosse0', 'scwx861', 'rabbit1', 'ecosse1', 'scwx862', 'rabbit2', 'scwx863' ], - 'armv5tl' => [ 'armlet1', 'armlet2' ], - 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'armlet1', 'armlet2' ], - 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa1-b', 'ec2aa2-b', 'scwaarch641', 'scwaarch643', 'scwaarch642', 'scwaarch644' ], + 'armv7hl' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b' ], + 'aarch64' => [ 'ec2aa1-a', 'ec2aa2-a', 'ec2aa3-a', 'ec2aa1-b', 'ec2aa2-b', 'ec2aa3-b', scwaarch641', 'scwaarch642' ], }, build_nodes_aliases => { 'ecosse0' => "ecosse.${::domain}", @@ -48,6 +47,8 @@ class mga_buildsystem::config { 'ec2aa1-b' => "ec2aa1.${::domain}", 'ec2aa2-a' => "ec2aa2.${::domain}", 'ec2aa2-b' => "ec2aa2.${::domain}", + 'ec2aa3-a' => "ec2aa3.${::domain}", + 'ec2aa3-b' => "ec2aa3.${::domain}", }, build_src_node => 'duvel', } -- cgit v1.2.1