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

koji: image-builder for production #2590

Merged
ryanlerch merged 1 commit from main into main 2025-04-28 18:59:25 +00:00
Conversation 6 Commits 1 Files changed 5 +6 -10
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/koji_builder/tasks/main.yml
View file

@ -103,7 +103,6 @@
state: present state: present
name: name:
- koji-image-builder-builder - koji-image-builder-builder
when: env == 'staging'
tags: tags:
- koji_builder - koji_builder
- koji_builder_image_builder - koji_builder_image_builder

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

@ -117,9 +117,7 @@ keytab = /etc/kojid/kojid.keytab
{{ plugins.append("kiwi") }} {{ plugins.append("kiwi") }}
{% if env == 'staging' %}
{{ plugins.append("image_builder") }} {{ plugins.append("image_builder") }}
{% endif %}
; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
plugins = {{ plugins | join(" ") }} plugins = {{ plugins | join(" ") }}

1
roles/koji_hub/tasks/main.yml
View file

@ -37,7 +37,6 @@
ansible.builtin.package: name={{ item }} state=present ansible.builtin.package: name={{ item }} state=present
with_items: with_items:
- koji-image-builder-hub - koji-image-builder-hub
when: env == 'staging'
notify: notify:
- Restart kojira - Restart kojira
tags: tags:

4
roles/koji_hub/templates/hub.conf.j2
View file

@ -115,9 +115,9 @@ MissingPolicyOk = False
{% if env == "staging" %} {% if env == "staging" %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% elif koji_instance == "primary" %} {% elif koji_instance == "primary" %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% else %} {% else %}
Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
{% endif %} {% endif %}
[policy] [policy]

8
roles/koji_hub/templates/web.conf.j2
View file

@ -45,10 +45,10 @@ KojiHubCA = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
{% elif koji_instance == "primary" %} {% elif koji_instance == "primary" %}
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
{% else %} {% else %}
Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
ParentTasks = flatpakBuild,osbuildImage,kiwiBuild ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
{% endif %} {% endif %}
ToplevelTasks = flatpakBuild,osbuildImage ToplevelTasks = flatpakBuild,osbuildImage