Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

buildvm_s390x: cleanup and add 7 new builders.

Browse source 
We no longer need to keep any config around from boston, so nuke that.
All the buildvm's are now kvm, so we don't need a seperate group/config
for that, so remove it.

Consolidate the variables down to buildvm_s390x group and only have ip
address for host vars.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-12-10 10:50:25 -08:00
parent e547715fce
commit 82a8e8dbc9
26 changed files with 33 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

21
inventory/builders
View file

@ -95,7 +95,7 @@ buildvm-a64-38.iad2.fedoraproject.org
buildvm-a64-39.iad2.fedoraproject.org
buildvm-a64-40.iad2.fedoraproject.org
[buildvm_s390x_kvm]
[buildvm_s390x]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-02.s390.fedoraproject.org
buildvm-s390x-03.s390.fedoraproject.org
@ -111,25 +111,6 @@ buildvm-s390x-12.s390.fedoraproject.org
buildvm-s390x-13.s390.fedoraproject.org
buildvm-s390x-14.s390.fedoraproject.org
[buildvm_s390x_rdu]
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-02.s390.fedoraproject.org
buildvm-s390x-03.s390.fedoraproject.org
buildvm-s390x-04.s390.fedoraproject.org
buildvm-s390x-05.s390.fedoraproject.org
buildvm-s390x-06.s390.fedoraproject.org
buildvm-s390x-07.s390.fedoraproject.org
buildvm-s390x-08.s390.fedoraproject.org
buildvm-s390x-09.s390.fedoraproject.org
buildvm-s390x-10.s390.fedoraproject.org
buildvm-s390x-11.s390.fedoraproject.org
buildvm-s390x-12.s390.fedoraproject.org
buildvm-s390x-13.s390.fedoraproject.org
buildvm-s390x-14.s390.fedoraproject.org
[buildvm_s390x:children]
buildvm_s390x_kvm
[bvmhost_s390x]
bvmhost-s390x-01.stg.s390.fedoraproject.org
bvmhost-s390x-01.s390.fedoraproject.org

15
inventory/group_vars/buildvm_s390x
View file

@ -8,10 +8,25 @@ csi_relationship: |
* 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
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
external: false
has_ipv4: yes
host_group: kojibuilder
koji_hub_nfs: "fedora_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-secondary/releases/41/Server/s390x/os/
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 2
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.11
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.50
has_ipv4: yes
lvm_size: 102400
main_bridge: br0
mem_size: 12288
num_cpus: 2
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.stg.s390.fedoraproject.org
volgroup: /dev/fedora_rdu-z16-l51

14
inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.12
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.13
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.14
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.15
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.16
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.17
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.18
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.19
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.20
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.21
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.22
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

14
inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org
View file

@ -1,16 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.23
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

18
inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org
View file

@ -1,20 +1,2 @@
---
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
eth0_ipv4_gw: 10.1.102.254
eth0_ipv4_ip: 10.1.102.24
has_ipv4: yes
lvm_size: 128000
main_bridge: br0
mem_size: 25600
num_cpus: 3
tcp_ports: [
# allow incoming varnish requests to varnish cache
80
]
varnish_group: s390kojipkgs
virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
vmhost: bvmhost-s390x-01.s390.fedoraproject.org
volgroup: /dev/vg_guests

2
inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.25

2
inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.26

2
inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.27

2
inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.28

2
inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.29

2
inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.30

2
inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org Normal file
View file

@ -0,0 +1,2 @@
---
eth0_ipv4_ip: 10.1.102.31

2
playbooks/groups/buildvm.yml
View file

@ -6,7 +6,7 @@
---
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
vars:
myhosts: "buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x_kvm"
myhosts: "buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x"
- name: make koji builder(s)
hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x:buildvm_s390x_stg

7
roles/koji_builder/templates/kojid.conf
View file

@ -33,11 +33,8 @@ failed_buildroot_lifetime=86400
failed_buildroot_lifetime=14400
{% endif %}
{% if host in groups['buildvm_s390x'] and host not in groups['buildvm_s390x_rdu'] %}
# s390x builders in bos use two local varnish cache instances
topurl = http://kojipkgs-cache01.s390.fedoraproject.org http://kojipkgs-cache02.s390.fedoraproject.org
{% elif host in groups['buildvm_s390x'] and host in groups['buildvm_s390x_rdu'] %}
# s390x builders in rdu use a local varnish cache instance
{% if host in groups['buildvm_s390x'] and env != 'staging' %}
# prod s390x builders in rdu use a local varnish cache instance
topurl = http://kojipkgs-cache03.s390.fedoraproject.org
{% elif host in groups['buildvm_s390x_stg'] %}
# s390x staging builder uses a local varnish cache