Fare thee well 32bit arm. You served long and well.

Now that f36 is eol we don't need 32bit arm builders, test machines or
exceptions anywhere.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-05-16 17:05:14 -07:00
parent 6679b35345
commit 624f7545f0
11 changed files with 4 additions and 200 deletions

View file

@ -43,10 +43,6 @@ buildvm-x86-05.stg.iad2.fedoraproject.org
buildvm-a64-01.stg.iad2.fedoraproject.org
buildvm-a64-02.stg.iad2.fedoraproject.org
[buildvm_armv7_stg]
buildvm-a32-01.stg.iad2.fedoraproject.org
buildvm-a32-02.stg.iad2.fedoraproject.org
[buildvm_s390x_stg]
buildvm-s390x-01.stg.s390.fedoraproject.org
@ -99,41 +95,6 @@ buildvm-a64-38.iad2.fedoraproject.org
buildvm-a64-39.iad2.fedoraproject.org
buildvm-a64-40.iad2.fedoraproject.org
[buildvm_armv7]
buildvm-a32-01.iad2.fedoraproject.org
buildvm-a32-02.iad2.fedoraproject.org
buildvm-a32-03.iad2.fedoraproject.org
buildvm-a32-04.iad2.fedoraproject.org
buildvm-a32-05.iad2.fedoraproject.org
buildvm-a32-06.iad2.fedoraproject.org
buildvm-a32-07.iad2.fedoraproject.org
buildvm-a32-08.iad2.fedoraproject.org
buildvm-a32-09.iad2.fedoraproject.org
buildvm-a32-10.iad2.fedoraproject.org
buildvm-a32-11.iad2.fedoraproject.org
buildvm-a32-12.iad2.fedoraproject.org
buildvm-a32-13.iad2.fedoraproject.org
buildvm-a32-14.iad2.fedoraproject.org
buildvm-a32-15.iad2.fedoraproject.org
buildvm-a32-16.iad2.fedoraproject.org
buildvm-a32-17.iad2.fedoraproject.org
buildvm-a32-18.iad2.fedoraproject.org
buildvm-a32-19.iad2.fedoraproject.org
buildvm-a32-20.iad2.fedoraproject.org
buildvm-a32-21.iad2.fedoraproject.org
buildvm-a32-22.iad2.fedoraproject.org
buildvm-a32-23.iad2.fedoraproject.org
buildvm-a32-24.iad2.fedoraproject.org
buildvm-a32-25.iad2.fedoraproject.org
buildvm-a32-26.iad2.fedoraproject.org
buildvm-a32-27.iad2.fedoraproject.org
buildvm-a32-28.iad2.fedoraproject.org
buildvm-a32-29.iad2.fedoraproject.org
buildvm-a32-30.iad2.fedoraproject.org
buildvm-a32-31.iad2.fedoraproject.org
buildvm-a32-32.iad2.fedoraproject.org
buildvm-a32-33.iad2.fedoraproject.org
[buildvm_s390x_zvm]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-02.s390.fedoraproject.org
@ -301,9 +262,6 @@ buildvm-x86-03.iad2.fedoraproject.org
buildvm-a64-01.iad2.fedoraproject.org
buildvm-a64-02.iad2.fedoraproject.org
buildvm-a64-03.iad2.fedoraproject.org
# buildvm-armv7-01.stg.arm.fedoraproject.org
buildvm-a32-01.iad2.fedoraproject.org
buildvm-a32-02.iad2.fedoraproject.org
# buildvm-ppc64le-01.stg.ppc.fedoraproject.org
buildvm-ppc64le-01.iad2.fedoraproject.org
buildvm-ppc64le-11.iad2.fedoraproject.org
@ -319,7 +277,6 @@ buildvm-s390x-17.s390.fedoraproject.org
buildhw
buildvm
buildvm_aarch64
buildvm_armv7
buildvm_ppc64le
buildvm_s390x
bkernel
@ -328,5 +285,4 @@ bkernel
buildvm_stg
buildvm_ppc64le_stg
buildvm_aarch64_stg
buildvm_armv7_stg
buildvm_s390x_stg

View file

@ -247,8 +247,6 @@ virt_install_command: "{{ virt_install_command_one_nic }}"
virt_install_command_aarch64_one_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole
virt_install_command_aarch64_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole
virt_install_command_aarch64_two_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }} --autostart --noautoconsole --rng /dev/random
virt_install_command_armv7_one_nic: virt-install -n {{ inventory_hostname }} --arch armv7l --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyAMA0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }} --autostart --noautoconsole --rng /dev/random
virt_install_command_armv7_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --arch armv7l --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyAMA0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --rng /dev/random
virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns }} nameserver=8.8.8.8 ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --watchdog default --rng /dev/random --cpu host
virt_install_command_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns1 }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --watchdog default --rng /dev/random --cpu host
virt_install_command_ppc64le_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --watchdog default --rng /dev/random

View file

@ -1,37 +0,0 @@
---
# common items for the buildvm-aarmv7* koji builders
csi_primary_contact: Fedora Admins - admin@fedoraproject.org
csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders.
csi_relationship: |
* VMs built on top of buildvmhost
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
csi_security_category: High
dns: 10.3.163.33
docker_registry: "candidate-registry.fedoraproject.org"
eth0_ipv4_gw: 10.3.170.254
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
host_group: kojibuilder
koji_hub: "koji.fedoraproject.org/kojihub"
koji_hub_nfs: "fedora_koji"
koji_root: "koji.fedoraproject.org/koji"
koji_server_url: "https://koji.fedoraproject.org/kojihub"
koji_topurl: "https://kojipkgs.fedoraproject.org/"
koji_weburl: "https://koji.fedoraproject.org/koji"
ks_repo: http://10.3.163.35/pub/fedora/linux/releases/37/Server/armhfp/os/
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-armv7
lvm_size: 140000
max_cpu: "{{ num_cpus }}"
max_mem_size: "{{ mem_size }}"
mem_size: 40960
num_cpus: 5
# These variables are for koji-containerbuild/osbs
osbs_url: "osbs.fedoraproject.org"
source_registry: "registry.fedoraproject.org"
# This is reverted so that eth1 gets br0 and eth0 gets br1
# This seems some kind of bug where in the guest kernel the devices are swapped around
# when compared to the host.
virt_install_command: "{{ virt_install_command_armv7_one_nic_unsafe }}"
volgroup: /dev/vg_guests

View file

@ -1,42 +0,0 @@
---
# common items for the buildvm-* koji builders
createrepo: True
csi_primary_contact: Fedora Admins - admin@fedoraproject.org
csi_purpose: Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders (staging).
csi_relationship: |
* VMs built on top of buildvmhost
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
csi_security_category: High
datacenter: staging
dns: 10.3.163.33
docker_registry: "candidate-registry.stg.fedoraproject.org"
eth0_ipv4_gw: 10.3.167.254
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
host_group: kojibuilder
koji_hub: "koji.stg.fedoraproject.org/kojihub"
koji_hub_nfs: "fedora_koji"
koji_root: "koji.stg.fedoraproject.org/koji"
koji_server_url: "https://koji.stg.fedoraproject.org/kojihub"
koji_topurl: "https://kojipkgs.stg.fedoraproject.org/"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
# See http://infrastructure.fedoraproject.org/csi/security-policy/
koji_weburl: "https://koji.stg.fedoraproject.org/koji"
ks_repo: http://10.3.163.35/pub/fedora/linux/releases/37/Server/armhfp/os/
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-armv7
lvm_size: 140000
max_cpu: "{{ num_cpus }}"
max_mem_size: "{{ mem_size }}"
mem_size: 40960
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"
num_cpus: 5
# These variables are for koji-containerbuild/osbs
osbs_url: "osbs.stg.fedoraproject.org"
source_registry: "registry.stg.fedoraproject.org"
# this is to enable nested virt, which we need for some builds
virt_install_command: "{{ virt_install_command_armv7_one_nic_unsafe }}"
volgroup: /dev/vg_guests

View file

@ -1,27 +0,0 @@
---
datacenter: rdu-cc
dns1: 8.8.8.8
dns2: 8.8.4.4
eth0_ipv4_gw: 8.43.85.254
eth0_ipv4_ip: 8.43.85.52
ks_repo: http://38.145.60.16/pub/fedora/linux/releases/36/Server/armhfp/os/
ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
libdir: /usr/lib
lvm_size: 140000
max_mem_size: "{{ mem_size }}"
mem_size: 40960
nagios_Check_Services:
dhcpd: false
httpd: false
mail: false
named: false
nrpe: false
ping: false
raid: false
sshd: false
swap: false
num_cpus: 5
virt_install_command: "{{ virt_install_command_armv7_one_nic_unsafe }}"
vmhost: vmhost-a64-cc01.rdu-cc.fedoraproject.org
volgroup: /dev/vg_guests
vpn: true

View file

@ -1,27 +0,0 @@
---
datacenter: rdu-cc
dns1: 8.8.8.8
dns2: 8.8.4.4
eth0_ipv4_gw: 8.43.85.254
eth0_ipv4_ip: 8.43.85.53
ks_repo: http://38.145.60.16/pub/fedora/linux/releases/36/Server/armhfp/os/
ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
libdir: /usr/lib
lvm_size: 140000
max_mem_size: "{{ mem_size }}"
mem_size: 40960
nagios_Check_Services:
dhcpd: false
httpd: false
mail: false
named: false
nrpe: false
ping: false
raid: false
sshd: false
swap: false
num_cpus: 5
virt_install_command: "{{ virt_install_command_armv7_one_nic_unsafe }}"
vmhost: vmhost-a64-cc01.rdu-cc.fedoraproject.org
volgroup: /dev/vg_guests
vpn: true

View file

@ -647,8 +647,6 @@ bvmhost-p09-01.stg.iad2.fedoraproject.org
bvmhost-a64-01.stg.iad2.fedoraproject.org
buildvm-a64-01.stg.iad2.fedoraproject.org
buildvm-a64-02.stg.iad2.fedoraproject.org
buildvm-a32-01.stg.iad2.fedoraproject.org
buildvm-a32-02.stg.iad2.fedoraproject.org
buildvm-ppc64le-01.stg.iad2.fedoraproject.org
buildvm-ppc64le-02.stg.iad2.fedoraproject.org
buildvm-ppc64le-03.stg.iad2.fedoraproject.org
@ -901,8 +899,6 @@ el9-test.fedorainfracloud.org
ppc64le-test.fedorainfracloud.org
aarch64-test01.fedorainfracloud.org
aarch64-test02.fedorainfracloud.org
armv7-test01.fedorainfracloud.org
armv7-test02.fedorainfracloud.org
#[aarch64_test]
#aarch64-test01.fedorainfracloud.org
@ -1227,7 +1223,6 @@ bodhi_backend
buildhw
buildvm
buildvm_aarch64
buildvm_armv7
buildvm_ppc64le
bkernel
busgateway
@ -1278,7 +1273,6 @@ bodhi_backend_stg
buildvm_stg
buildvm_ppc64le_stg
buildvm_aarch64_stg
buildvm_armv7_stg
busgateway_stg
dbserver_stg
debuginfod_stg

View file

@ -3,10 +3,10 @@
# NOTE: make sure there is room/space for this builder on the buildvmhost
# NOTE: most of these vars_path come from group_vars/buildvm or from hostvars
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x_kvm"
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x_kvm"
- name: make koji builder(s)
hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg
hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x:buildvm_s390x_stg
user: root
gather_facts: True

View file

@ -1,5 +1,3 @@
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=armv7-test01.fedorainfracloud.org:armv7-test02.fedorainfracloud.org"
- name: Setup maintainer test hosts
hosts: maintainer_test
gather_facts: True

View file

@ -49,12 +49,3 @@ email_host = localhost
# Use this to filter DNF core messages
debuglevel = 1
{% if inventory_hostname.startswith('pkgs') %}
# exclude jq-1.6-3.el8
# as it's causing segfaults in https pushes
# by running out of memory
exclude = jq-1.6-3.el8
{% endif %}
{% if inventory_hostname.startswith('buildvm-a32') %}
exclude = kernel-core*,kernel-modules*
{% endif %}

View file

@ -1,12 +1,12 @@
define service {
hostgroup_name all,!no_ping, !buildvm_armv7, !buildvm_s390x
hostgroup_name all,!no_ping, !buildvm_s390x
service_description ICMP-Ping4
check_command check_ping4!350.0,20%!500.0,60%
use criticaltemplate
}
define service {
hostgroup_name buildvm_armv7, buildvm_s390x
hostgroup_name buildvm_s390x
service_description ICMP-Ping4-vm-builders
check_command check_ping4!1500.0,20%!2500.0,80%
use criticaltemplate