commit ee97ddac7b8a19616ccd44964cda668eed0c6b9e Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Fri Oct 18 17:53:13 2024 +0200 Update koji_builders roles/koji_builder/tasks/main.yml | 6 ++++-- roles/koji_builder/templates/oz.cfg.j2 | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) --- diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index c60ebe0..0b6967a 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -88,6 +88,8 @@ - pycdio - python3-kickstart - libvirt-client + - oz + - imagefactory - pykickstart - nosync tags: @@ -198,6 +200,7 @@ template: src=oz.cfg.j2 dest=/etc/oz/oz.cfg tags: - koji_builder + - koji_builder/oz.cfg # install libvirtd.conf # @@ -286,7 +289,6 @@ tags: - koji_builder - selinux - when: ansible_architecture != 'armv7l' and ansible_architecture != 'aarch64' - name: Create directory for shared secrets file: @@ -328,7 +330,7 @@ tags: - koji_builder - koji_builder/rngd - when: ansible_architecture != 's390x' + when: ansible_architecture != 's390x' and ansible_architecture != 'ppc64le' - name: disable systemd-oomd we do not need or want it systemd: name=systemd-oomd state=stopped enabled=no masked=true diff --git a/roles/koji_builder/templates/oz.cfg.j2 b/roles/koji_builder/templates/oz.cfg.j2 index 33a76e4..aac5f7d 100644 --- a/roles/koji_builder/templates/oz.cfg.j2 +++ b/roles/koji_builder/templates/oz.cfg.j2 @@ -9,12 +9,13 @@ uri = qemu:///system image_type = raw # type = kvm # bridge_name = virbr0 -{% if ansible_architecture == 'armv7l' or ansible_architecture == 'aarch64' %} -cpus = 1 -memory = 1024 -{% else %} -cpus = 2 -memory = 3096 +{% if ansible_architecture == 'ppc64le' or ansible_architecture == 'aarch64' %} +cpus = 4 +memory = 4096 +{% endif %} +{% if ansible_architecture == 'x86_64' %} +cpus = 6 +memory = 8192 {% endif %} [cache] @@ -25,3 +26,8 @@ jeos = no [icicle] safe_generation = no +[timeouts] +install = 14400 +inactivity = 450 +boot = 300 +shutdown = 90