diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_lab similarity index 95% rename from inventory/group_vars/openqa_stg rename to inventory/group_vars/openqa_lab index 516106e5fd..49c4418214 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_lab @@ -43,7 +43,7 @@ openqa_repo: updates-testing wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json" openqa_wikitcms_hostname: stg.fedoraproject.org -openqa_resultsdb_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ +openqa_resultsdb_url: http://resultsdb-stg01.fedoraproject.org/resultsdb_api/api/v2.0/ openqa_update_arches: ['x86_64', 'ppc64le'] # FIXME: disable consumers that write to wiki until auth key diff --git a/inventory/group_vars/openqa_stg_workers b/inventory/group_vars/openqa_lab_workers similarity index 88% rename from inventory/group_vars/openqa_stg_workers rename to inventory/group_vars/openqa_lab_workers index 8c4476cf3d..e1f191ff62 100644 --- a/inventory/group_vars/openqa_stg_workers +++ b/inventory/group_vars/openqa_lab_workers @@ -1,6 +1,6 @@ -gw: 10.5.124.254 +gw: 10.3.174.254 openqa_workers: 4 -openqa_hostname: openqa-stg01.iad2.fedoraproject.org +openqa_hostname: openqa-lab01.iad2.fedoraproject.org openqa_key: "{{ stg_openqa_apikey }}" openqa_secret: "{{ stg_openqa_apisecret }}" diff --git a/inventory/host_vars/openqa-stg01.iad2.fedoraproject.org b/inventory/host_vars/openqa-lab01.iad2.fedoraproject.org similarity index 84% rename from inventory/host_vars/openqa-stg01.iad2.fedoraproject.org rename to inventory/host_vars/openqa-lab01.iad2.fedoraproject.org index 37356006de..fd8b658cc9 100644 --- a/inventory/host_vars/openqa-stg01.iad2.fedoraproject.org +++ b/inventory/host_vars/openqa-lab01.iad2.fedoraproject.org @@ -15,7 +15,7 @@ eth0_ip: 10.3.174.57 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ volgroup: /dev/vg_guests -vmhost: qvmhost-x86-02.iad2.fedoraproject.org +vmhost: qvmhost-x86-01.iad2.fedoraproject.org datacenter: iad2 ############################################################ @@ -24,9 +24,10 @@ datacenter: iad2 fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran -lvm_size: 500000 +lvm_size: 1800000 mem_size: 16384 -num_cpus: 10 +mem_size: 262144 +num_cpus: 60 -nrpe_procs_warn: 250 -nrpe_procs_crit: 300 +nrpe_procs_warn: 1000 +nrpe_procs_crit: 1200 diff --git a/inventory/inventory b/inventory/inventory index 6da6ccad9b..b3a49972f6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -441,7 +441,7 @@ odcs_backend # common group for variables shared between prod and stg servers [openqa_common] openqa01.iad2.fedoraproject.org -#openqa-stg01.iad2.fedoraproject.org +openqa-lab01.iad2.fedoraproject.org [openqa] openqa01.iad2.fedoraproject.org @@ -451,12 +451,13 @@ openqa-x86-worker01.iad2.fedoraproject.org openqa-x86-worker02.iad2.fedoraproject.org openqa-x86-worker04.iad2.fedoraproject.org -# openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details -[openqa_stg] -#openqa-stg01.iad2.fedoraproject.org +# openqa-lab and openqa-lab-workers are pseudo-stg, see group_vars/openqa-stg for more details +[openqa_lab] +openqa-lab01.iad2.fedoraproject.org -[openqa_stg_workers] -#openqa-a64-worker01.iad2.fedoraproject.org +[openqa_lab_workers] +openqa-a64-worker03.iad2.fedoraproject.org +openqa-p09-worker01.iad2.fedoraproject.org # the workers that can run networked jobs. each server should have *one* of these per arch [openqa_tap_workers] @@ -522,7 +523,7 @@ proxy02.stg.iad2.fedoraproject.org [relvalconsumer_common] openqa01.iad2.fedoraproject.org -#openqa-stg01.iad2.fedoraproject.org +#openqa-lab01.iad2.fedoraproject.org # This group should only ever contain *ONE* system [relvalconsumer] @@ -1095,7 +1096,7 @@ value01.iad2.fedoraproject.org # os-proxy02.fedorainfracloud.org [iad2] -#openqa-a64-worker01.iad2.fedoraproject.org +openqa-a64-worker01.iad2.fedoraproject.org #openqa-stg01.iad2.fedoraproject.org #autosign01.iad2.fedoraproject.org backup01.iad2.fedoraproject.org diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index a100af14f1..800b5c3bf2 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -1,5 +1,5 @@ - name: configure openQA workers - hosts: openqa_workers:openqa_hdds_workers:openqa_stg_workers + hosts: openqa_workers:openqa_hdds_workers:openqa_lab_workers user: root gather_facts: True