From 08113b252ab8ea504a7189a8c5552777b4783df4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Oct 2017 20:30:25 +0000 Subject: [PATCH] drop all the arm01, arm02, arm04 instances --- inventory/builders | 101 ------------------ inventory/inventory | 3 - playbooks/groups/buildhw.yml | 2 +- .../templates/koji-reset-staging.sql | 12 --- 4 files changed, 1 insertion(+), 117 deletions(-) diff --git a/inventory/builders b/inventory/builders index 42630240eb..9499f56ae3 100644 --- a/inventory/builders +++ b/inventory/builders @@ -243,78 +243,10 @@ aarch64-07a.arm.fedoraproject.org bkernel01.phx2.fedoraproject.org bkernel02.phx2.fedoraproject.org -[buildarm:children] -arm01 -arm02 -arm04 - -[arm01] -# 01 is in use as retrace instance -arm01-builder00.arm.fedoraproject.org -#arm01-retrace01.arm.fedoraproject.org -arm01-builder02.arm.fedoraproject.org -arm01-builder03.arm.fedoraproject.org -arm01-builder04.arm.fedoraproject.org -arm01-builder05.arm.fedoraproject.org -arm01-builder06.arm.fedoraproject.org -arm01-builder07.arm.fedoraproject.org -arm01-builder08.arm.fedoraproject.org -arm01-builder09.arm.fedoraproject.org -arm01-builder10.arm.fedoraproject.org -arm01-builder11.arm.fedoraproject.org -arm01-builder12.arm.fedoraproject.org -arm01-builder13.arm.fedoraproject.org -arm01-builder14.arm.fedoraproject.org -arm01-builder15.arm.fedoraproject.org -arm01-builder16.arm.fedoraproject.org -arm01-builder17.arm.fedoraproject.org -arm01-builder18.arm.fedoraproject.org -arm01-builder19.arm.fedoraproject.org -arm01-builder20.arm.fedoraproject.org -arm01-builder21.arm.fedoraproject.org -# These two are using in staging -#arm01-builder22.arm.fedoraproject.org -#arm01-builder23.arm.fedoraproject.org - -[buildarm-stg] -arm01-builder22.arm.fedoraproject.org -arm01-builder23.arm.fedoraproject.org - -# -# These are primary arch builders. -# -[arm02] -arm02-builder00.arm.fedoraproject.org -arm02-builder01.arm.fedoraproject.org -arm02-builder02.arm.fedoraproject.org -arm02-builder03.arm.fedoraproject.org -arm02-builder04.arm.fedoraproject.org -arm02-builder05.arm.fedoraproject.org -arm02-builder06.arm.fedoraproject.org -# arm02-builder07 kernel panics under any load. -#arm02-builder07.arm.fedoraproject.org -arm02-builder08.arm.fedoraproject.org -arm02-builder09.arm.fedoraproject.org -arm02-builder10.arm.fedoraproject.org -arm02-builder11.arm.fedoraproject.org -arm02-builder12.arm.fedoraproject.org -arm02-builder13.arm.fedoraproject.org -arm02-builder14.arm.fedoraproject.org -arm02-builder15.arm.fedoraproject.org -arm02-builder16.arm.fedoraproject.org -arm02-builder17.arm.fedoraproject.org -arm02-builder18.arm.fedoraproject.org -arm02-builder19.arm.fedoraproject.org -arm02-builder20.arm.fedoraproject.org -arm02-builder21.arm.fedoraproject.org -arm02-builder22.arm.fedoraproject.org -arm02-builder23.arm.fedoraproject.org - # # These are misc # [arm03] -# These are in use as arm03-releng00 - 03 #arm03-builder00.arm.fedoraproject.org #arm03-builder01.arm.fedoraproject.org #arm03-builder02.arm.fedoraproject.org @@ -343,33 +275,6 @@ arm02-builder23.arm.fedoraproject.org #arm03-builder22.arm.fedoraproject.org #arm03-builder23.arm.fedoraproject.org -[arm04] -arm04-builder00.arm.fedoraproject.org -arm04-builder01.arm.fedoraproject.org -arm04-builder02.arm.fedoraproject.org -arm04-builder03.arm.fedoraproject.org -arm04-builder04.arm.fedoraproject.org -arm04-builder05.arm.fedoraproject.org -arm04-builder06.arm.fedoraproject.org -arm04-builder07.arm.fedoraproject.org -arm04-builder08.arm.fedoraproject.org -arm04-builder09.arm.fedoraproject.org -arm04-builder10.arm.fedoraproject.org -arm04-builder11.arm.fedoraproject.org -arm04-builder12.arm.fedoraproject.org -arm04-builder13.arm.fedoraproject.org -arm04-builder14.arm.fedoraproject.org -arm04-builder15.arm.fedoraproject.org -arm04-builder16.arm.fedoraproject.org -# Still crashes under load - 2017-01-27 -#arm04-builder17.arm.fedoraproject.org -arm04-builder18.arm.fedoraproject.org -arm04-builder19.arm.fedoraproject.org -arm04-builder20.arm.fedoraproject.org -arm04-builder21.arm.fedoraproject.org -arm04-builder22.arm.fedoraproject.org -arm04-builder23.arm.fedoraproject.org - # These hosts get the runroot plugin installed. # They should be added to their own 'compose' channel in the koji db # .. and they should not appear in the default channel for builds. @@ -382,10 +287,6 @@ buildvm-aarch64-02.arm.fedoraproject.org buildvm-armv7-01.arm.fedoraproject.org buildvm-armv7-02.arm.fedoraproject.org buildvm-armv7-03.arm.fedoraproject.org -arm04-builder00.arm.fedoraproject.org -arm04-builder01.arm.fedoraproject.org -arm02-builder21.arm.fedoraproject.org -arm02-builder23.arm.fedoraproject.org aarch64-02a.arm.fedoraproject.org buildvm-ppc64-01.ppc.fedoraproject.org buildvm-ppc64-02.ppc.fedoraproject.org @@ -402,14 +303,12 @@ buildvm-ppc64 buildvm-ppc64le buildppc buildppcle -buildarm buildaarch64 buildvm-s390 buildvm-s390x bkernel [builders-stg:children] -buildarm-stg buildvm-stg buildvm-ppc64-stg buildvm-ppc64le-stg diff --git a/inventory/inventory b/inventory/inventory index 26efc354bd..44f909ece8 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -38,7 +38,6 @@ compose-s390-01.s390.fedoraproject.org composer.stg.phx2.fedoraproject.org [retrace] -#arm01-retrace01.arm.fedoraproject.org retrace01.qa.fedoraproject.org retrace02.qa.fedoraproject.org @@ -735,8 +734,6 @@ smtp-mm-tummy01.fedoraproject.org # All staging hosts should be in this group too. # [staging] -arm01-builder22.arm.fedoraproject.org -arm01-builder23.arm.fedoraproject.org ask01.stg.phx2.fedoraproject.org autocloud-web01.stg.phx2.fedoraproject.org autocloud-web02.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 29893d3e79..68a640f6aa 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw - hosts: buildhw:buildarm:buildarm-stg:buildaarch64:buildppc64:bkernel + hosts: buildhw:buildaarch64:buildppc64:bkernel remote_user: root gather_facts: True diff --git a/playbooks/manual/staging-sync/templates/koji-reset-staging.sql b/playbooks/manual/staging-sync/templates/koji-reset-staging.sql index 9043f43d5b..f9b8d2f3ac 100644 --- a/playbooks/manual/staging-sync/templates/koji-reset-staging.sql +++ b/playbooks/manual/staging-sync/templates/koji-reset-staging.sql @@ -96,18 +96,6 @@ insert into host_channels (host_id, channel_id) values ( {% endfor %} {% endfor %} --- The arm builders are armhfp and do not have createrepo ability -{% for host in groups['buildarm-stg'] %} -select now() as time, 'adding staging host {{ host }}' as msg; -insert into users (name, usertype, krb_principal, status) values ('{{ host }}', 1, 'compile/{{ host }}@STG.FEDORAPROJECT.ORG', 0); -insert into host (user_id, name, arches) values ( - (select id from users where name='{{host}}'), '{{host}}', 'armhfp'); -{% for channel in [ 'default', 'appliance', 'vm', 'secure-boot', 'compose', 'eclipse', 'images', 'image'] %} -insert into host_channels (host_id, channel_id) values ( - (select id from host where name='{{host}}'), (select id from channels where name='{{channel}}')); -{% endfor %} -{% endfor %} - -- The aarch64 builders are aarch64 and do not have createrepo {% for host in groups['buildvm-aarch64-stg'] %}