From d1163f22871b0ea67b4be6cb04b2b4cfb18ba54d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 30 Jun 2025 16:13:29 -0700 Subject: [PATCH] openQA: try and set up inventory for new lab x86 worker hosts Let's try and get the new x86 worker hosts for lab deployed... Signed-off-by: Adam Williamson --- ...openqa-x86-worker04.rdu3.fedoraproject.org | 10 +++--- ...openqa-x86-worker05.rdu3.fedoraproject.org | 10 +++--- inventory/inventory | 35 ++++++------------- 3 files changed, 20 insertions(+), 35 deletions(-) diff --git a/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org index 4e2ed859ba..49fdc89fe7 100644 --- a/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker04.rdu3.fedoraproject.org @@ -63,15 +63,15 @@ nrpe_procs_crit: 1600 nrpe_procs_warn: 1400 # Has a hardware RNG openqa_rngd: true -openqa_tap_iface: eno1np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 +openqa_tap_iface: br0 +# this is a very powerful machine, can handle so many openQA workers +openqa_workers: 60 # also means we need to bump the load average threshold -openqa_critical_threshold: 60 +openqa_critical_threshold: 120 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'] +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', '20363', '20373', '20383', '20393', '20403', '20413', '20423', '20433', '20443', '20453', '20463', '20473', '20483', '20493', '20503', '20513', '20523', '20533', '20543', '20553', '20563', '20573', '20583', '20593', '20603'] diff --git a/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org b/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org index b7741468f8..990080d5ce 100644 --- a/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org +++ b/inventory/host_vars/openqa-x86-worker05.rdu3.fedoraproject.org @@ -63,15 +63,15 @@ nrpe_procs_crit: 1600 nrpe_procs_warn: 1400 # Has a hardware RNG openqa_rngd: true -openqa_tap_iface: eno1np0 -# this is a powerful machine, can handle more openQA workers -openqa_workers: 30 +openqa_tap_iface: br0 +# this is a very powerful machine, can handle so many openQA workers +openqa_workers: 60 # also means we need to bump the load average threshold -openqa_critical_threshold: 60 +openqa_critical_threshold: 120 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'] +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', '20363', '20373', '20383', '20393', '20403', '20413', '20423', '20433', '20443', '20453', '20463', '20473', '20483', '20493', '20503', '20513', '20523', '20533', '20543', '20553', '20563', '20573', '20583', '20593', '20603'] diff --git a/inventory/inventory b/inventory/inventory index 14d153acb0..462f677490 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -678,22 +678,9 @@ openqa-x86-worker01.rdu3.fedoraproject.org openqa-lab01.rdu3.fedoraproject.org [openqa_lab_workers] -# old, busted emags -# this seems to have some broken RAM so it's powered off -openqa-a64-worker01.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org -openqa-a64-worker03.iad2.fedoraproject.org -openqa-p09-worker01.iad2.fedoraproject.org -openqa-p09-worker02.iad2.fedoraproject.org -# xeon gold 6130 (second best) -openqa-x86-worker04.iad2.fedoraproject.org -# xeon e5-2683v4 (third best) -openqa-x86-worker05.iad2.fedoraproject.org -# prod used to have 01, 02, 03 and lab had 04, 05, 06 which was nice -# and clean, but 03 is weaker hardware and seems to be struggling -# lately, so we swapped 03 and 06 to give prod the best hw -# xeon e5-2680 (worst) -openqa-x86-worker03.iad2.fedoraproject.org +openqa-x86-worker04.rdu3.fedoraproject.org +openqa-x86-worker05.rdu3.fedoraproject.org +openqa-a64-worker02.rdu3.fedoraproject.org # the workers that can run networked jobs. each server should have *one* of these per arch # per tap worker class defined in os-autoinst-distri-fedora (currently there are two @@ -704,17 +691,16 @@ openqa-x86-worker03.iad2.fedoraproject.org openqa-x86-worker01.iad2.fedoraproject.org openqa-a64-worker04.iad2.fedoraproject.org # lab -openqa-x86-worker04.iad2.fedoraproject.org -openqa-a64-worker03.iad2.fedoraproject.org -openqa-p09-worker01.iad2.fedoraproject.org +openqa-x86-worker04.rdu3.fedoraproject.org [openqa_tap2_workers] # prod openqa-x86-worker02.iad2.fedoraproject.org openqa-a64-worker05.iad2.fedoraproject.org +# these do both tap and tap2 - we only have one a64 worker host per +# instance ATM, so they have to +[openqa_tap12_workers] # lab -openqa-x86-worker05.iad2.fedoraproject.org -openqa-a64-worker02.iad2.fedoraproject.org -openqa-p09-worker02.iad2.fedoraproject.org +openqa-a64-worker02.rdu3.fedoraproject.org # the workers that run createhdds to create the base disk images. Again, # only one per arch per instance should be present. @@ -723,9 +709,8 @@ openqa-p09-worker02.iad2.fedoraproject.org openqa-x86-worker01.iad2.fedoraproject.org openqa-a64-worker04.iad2.fedoraproject.org # lab -openqa-x86-worker04.iad2.fedoraproject.org -openqa-a64-worker03.iad2.fedoraproject.org -openqa-p09-worker01.iad2.fedoraproject.org +openqa-x86-worker04.rdu3.fedoraproject.org +openqa-a64-worker02.rdu3.fedoraproject.org # common group for variables shared between all openQA boxes [openqa_all_common:children]