diff --git a/inventory/builders b/inventory/builders index 23f49f30d7..bc9090a37a 100644 --- a/inventory/builders +++ b/inventory/builders @@ -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 diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index 10cd87997e..a759134c38 100644 --- a/inventory/group_vars/buildvm_s390x +++ b/inventory/group_vars/buildvm_s390x @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org index 41ab053b0b..ffb859e1aa 100644 --- a/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-01.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org index 693f3cc033..848de6b079 100644 --- a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org index 1aa0544513..e26ff17162 100644 --- a/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-02.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org index a0e16a3906..813f8ff27a 100644 --- a/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-03.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org index 23cbd0cdbb..d815d4cfbd 100644 --- a/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-04.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org index 0e7e8c7205..77f00e20c7 100644 --- a/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-05.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org index 9568148a3a..24793bfef0 100644 --- a/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-06.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org index 0708c0110b..37e7d88fd9 100644 --- a/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-07.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org index 1bcee819f1..8b0268655a 100644 --- a/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-08.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org index ce94cc29a3..3ba9f1b3ac 100644 --- a/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-09.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org index 30f1880372..ac505d3867 100644 --- a/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-10.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org index 2f5a511f2f..53393a4afc 100644 --- a/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-11.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org index 84c51e7ca9..75d67bf958 100644 --- a/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-12.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org index 3b06206d6f..5206ee3c1d 100644 --- a/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-13.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org index 614d7c9ffb..54a0f10ca3 100644 --- a/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-14.s390.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org new file mode 100644 index 0000000000..a96fae3d9c --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.25 diff --git a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org new file mode 100644 index 0000000000..3448a0b6e4 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.26 diff --git a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org new file mode 100644 index 0000000000..dc6ab7ac1b --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.27 diff --git a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org new file mode 100644 index 0000000000..221dda957f --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.28 diff --git a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org new file mode 100644 index 0000000000..b4a4849ded --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.29 diff --git a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org new file mode 100644 index 0000000000..d63bf1d5ee --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.30 diff --git a/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org new file mode 100644 index 0000000000..49f93fb736 --- /dev/null +++ b/inventory/host_vars/buildvm-s390x-21.s390.fedoraproject.org @@ -0,0 +1,2 @@ +--- +eth0_ipv4_ip: 10.1.102.31 diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index c3a3f8251a..a965c81c3b 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -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 diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 1c901b46d7..1ab2a7dd11 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -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