From c65da721e8ea1fbe3c3bb6c262293f73da975790 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 9 May 2023 11:02:29 -0700 Subject: [PATCH] openQA aarch64: add new box to prod, shift others around Thanks to nirik we have a new super-powerful openQA aarch64 worker host. For now, deploy it in production as the tap1 worker and keep one old busted emag on prod as the tap2 worker. Move the other old busted emag to lab so it has more capacity at least, and give it a conventional tap1/tap2 setup. I might tweak this again to have *only* the powerful worker in prod and make it run all the tap jobs, to see if that's more reliable than keeping an emag around. Or maybe I'll try and fiddle with the classes so only the powerful box runs graphical tests, or something. Signed-off-by: Adam Williamson --- ...openqa-a64-worker04.iad2.fedoraproject.org | 70 +++++++++++++++++++ inventory/inventory | 12 +++- 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org diff --git a/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org new file mode 100644 index 0000000000..221140f223 --- /dev/null +++ b/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org @@ -0,0 +1,70 @@ +--- +datacenter: iad2 +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: "iad2.fedoraproject.org" +dns_search2: "fedoraproject.org" +eth0_mac: "{{ mac1 }}" +eth1_mac: "{{ mac2 }}" +eth2_mac: "{{ mac3 }}" +eth3_mac: "{{ mac4 }}" +eth2_ipv4: 10.3.174.64 +eth2_ipv4_gw: 10.3.174.254 +eth2_ipv4_nm: 24 +eth2_mac: "{{ mac2 }}" +freezes: false +# eth0 is disabled/nothing +# eth1 is active network +# eth2 is disabled/nothing + +has_ipv4: yes +mac1: d8:5e:d3:8b:73:d6 +mac2: d8:5e:d3:8b:73:d7 +mac3: 0c:42:a1:5a:08:b0 +mac4: 0c:42:a1:5a:08:b1 +network_connections: + - autoconnect: no + mac: "{{ eth0_mac }}" + name: eth0 + state: down + type: ethernet + - autoconnect: no + mac: "{{ eth1_mac }}" + name: eth1 + state: down + type: ethernet + - autoconnect: yes + ip: + address: + - "{{ eth2_ipv4 }}/{{ eth2_ipv4_nm }}" + dhcp4: no + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - "{{ dns_search1 }}" + - "{{ dns_search2 }}" + gateway4: "{{ eth2_ipv4_gw }}" + mac: "{{ eth2_mac }}" + name: eth2 + state: up + type: ethernet + - autoconnect: no + mac: "{{ eth3_mac }}" + name: eth3 + state: down + type: ethernet +nrpe_procs_crit: 300 +nrpe_procs_warn: 250 +# has an HW RNG, so let's have rngd +openqa_rngd: true +openqa_tap_iface: eth2 +# this is a powerful machine, can handle more openQA workers +openqa_workers: 35 +sudoers: "{{ private }}/files/sudo/qavirt-sudoers" +# firewall ports for server->worker websockets connections +# this port is 'QEMUPORT plus 1' +# QEMUPORT is: +# $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002; +# so for worker 1 it's 20012, for worker 2 it's 20022, etc etc +tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303', '20313', '20323', '20333', '20343', '20353'] diff --git a/inventory/inventory b/inventory/inventory index 533ad07726..a55719ea95 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -453,7 +453,9 @@ openqa-x86-worker02.iad2.fedoraproject.org # swapped from lab as 03 is kinda poorly # xeon e5-2683v4 (third best) openqa-x86-worker06.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org +# 2023 newer, more powerful box +openqa-a64-worker04.iad2.fedoraproject.org +# old, busted emag openqa-a64-worker03.iad2.fedoraproject.org # openqa-lab and openqa-lab-workers are pseudo-stg, see group_vars/openqa-stg for more details @@ -461,7 +463,9 @@ openqa-a64-worker03.iad2.fedoraproject.org openqa-lab01.iad2.fedoraproject.org [openqa_lab_workers] +# old, busted emags openqa-a64-worker01.iad2.fedoraproject.org +openqa-a64-worker02.iad2.fedoraproject.org openqa-p09-worker01.iad2.fedoraproject.org openqa-p09-worker02.iad2.fedoraproject.org # xeon gold 6130 (second best) @@ -481,9 +485,10 @@ openqa-x86-worker03.iad2.fedoraproject.org [openqa_tap1_workers] # prod openqa-x86-worker01.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org +openqa-a64-worker04.iad2.fedoraproject.org # lab openqa-x86-worker04.iad2.fedoraproject.org +openqa-a64-worker01.iad2.fedoraproject.org openqa-p09-worker01.iad2.fedoraproject.org [openqa_tap2_workers] # prod @@ -491,12 +496,13 @@ openqa-x86-worker02.iad2.fedoraproject.org openqa-a64-worker03.iad2.fedoraproject.org # lab openqa-x86-worker05.iad2.fedoraproject.org +openqa-a64-worker02.iad2.fedoraproject.org openqa-p09-worker02.iad2.fedoraproject.org # these do both tap and tap2 - because we only have one aarch64 worker # for lab, it has to handle all tap jobs [openqa_tap12_workers] # lab -openqa-a64-worker01.iad2.fedoraproject.org +#openqa-a64-worker01.iad2.fedoraproject.org # the workers that run createhdds to create the base disk images. Again, # only one per arch per instance should be present.