add riscv x86 builders

We want a pair of x86_64 buildvm's to do tasks that don't need to be on
a riscv instance (create/newrepos, etc).

So adjust playbooks and add them.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2025-02-06 15:19:13 -08:00
parent 0a0713ecb4
commit bd21aa17c5
5 changed files with 54 additions and 2 deletions

View file

@ -255,6 +255,10 @@ buildvm-x86-03.stg.iad2.fedoraproject.org
buildvm-x86-04.stg.iad2.fedoraproject.org
buildvm-x86-05.stg.iad2.fedoraproject.org
[buildvm_x86_riscv]
buildvm-x86-riscv01.iad2.fedoraproject.org
buildvm-x86-riscv02.iad2.fedoraproject.org
[builders:children]
buildhw
buildvm

View file

@ -0,0 +1,29 @@
---
# common items for the buildvm-* koji builders
dns: 10.3.163.33
eth0_ipv4_gw: 10.3.172.254
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
host_group: kojibuilder
koji_hub: "riscv-koji.fedoraproject.org/kojihub"
koji_hub_nfs: "fedora_riscv_koji"
koji_root: "riscv-koji.fedoraproject.org/koji"
koji_server_url: "https://riscv-koji.fedoraproject.org/kojihub"
koji_topurl: "https://riscv-kojipkgs.fedoraproject.org/"
koji_weburl: "https://riscv-koji.fedoraproject.org/koji"
ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/
ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora
lvm_size: 262144
max_mem_size: "{{ mem_size }}"
mem_size: 15360
num_cpus: 6
virt_install_command: "{{ virt_install_command_one_nic_unsafe }}"
volgroup: /dev/vg_guests
notes: |
Koji service employs a set of machines to build packages for the Fedora project. This playbook builds vm builders.
* VMs built on top of buildvmhost
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* 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

View file

@ -0,0 +1,7 @@
---
datacenter: iad2
eth0_ipv4_gw: 10.3.172.254
eth0_ipv4_ip: 10.3.172.23
ipa_server: ipa01.iad2.fedoraproject.org
resolvconf: "resolv.conf/iad2"
vmhost: bvmhost-x86-riscv01.iad2.fedoraproject.org

View file

@ -0,0 +1,7 @@
---
datacenter: iad2
eth0_ipv4_gw: 10.3.172.254
eth0_ipv4_ip: 10.3.172.22
ipa_server: ipa01.iad2.fedoraproject.org
resolvconf: "resolv.conf/iad2"
vmhost: bvmhost-x86-riscv01.iad2.fedoraproject.org

View file

@ -58,6 +58,11 @@
- role: keytab/service
kt_location: /etc/kojid/kojid.keytab
service: compile
when: koji_instance != 'secondary'
- role: keytab/service
kt_location: /etc/kojid/kojid.keytab
service: compile-riscv
when: koji_instance == 'secondary'
- role: btrfs
btrfs_balance_period: weekly
# push built Flatpaks to candidate registry
@ -65,12 +70,12 @@
candidate_registry: "candidate-registry.fedoraproject.org"
candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}"
candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}"
when: env == "production"
when: env == "production" and koji_instance != 'secondary'
- role: login-registry
candidate_registry: "candidate-registry.stg.fedoraproject.org"
candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}"
candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}"
when: env == "staging"
when: env == "staging" and koji_instance != 'secondary'
handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml"