koji: image-builder for staging

Enables the `image-builder` plugin from `koji-image-builder` in the
staging environment for both the koji hub, and the koji builder (kojid).

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>

roles/koji_builder/tasks/main.yml

@@ -97,6 +97,17 @@
   tags:
   - koji_builder
   - koji_builder_osbuild
+
+- name: Install packages needed by koji_builders for image-builder
+  ansible.builtin.package:
+    state: present
+    name:
+    - koji-image-builder-builder
+  when: env == 'staging'
+  tags:
+  - koji_builder
+  - koji_builder_image_builder
+
 #
 # rpmautospec plugin
 #

roles/koji_builder/templates/kojid.conf

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

roles/koji_hub/tasks/main.yml

@@ -20,9 +20,9 @@
   - koji_hub
 
 #
-# Setup koji hub osbuild plugin.
+# Setup koji hub osbuild and image-builder plugin.
 #
-- name: Install image builder server packages
+- name: Install osbuild server packages
   ansible.builtin.package: name={{ item }} state=present
   with_items:
   - koji-osbuild-hub
@@ -33,6 +33,18 @@
   - koji_hub
   - koji_hub_osbuild
 
+- name: Install image-builder server packages
+  ansible.builtin.package: name={{ item }} state=present
+  with_items:
+  - koji-image-builder-hub
+  when: env == 'staging'
+  notify:
+  - Restart kojira
+  tags:
+  - packages
+  - koji_hub
+  - koji_hub_image_builder
+
 - name: Make koji pki directory
   ansible.builtin.file: state=directory path=/etc/pki/koji/ owner=root group=root
 
@@ -69,6 +81,7 @@
   - config
   - koji_hub
   - koji_hub_osbuild
+  - koji_hub_image_builder
   notify: Reload httpd
 
 - name: Kojiweb config

roles/koji_hub/templates/hub.conf.j2

@@ -113,7 +113,7 @@ MissingPolicyOk = False
 #Plugins = koji-disable-builds-plugin
 #Plugins = darkserver-plugin
 {% if env == "staging" %}
-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
 {% elif koji_instance == "primary" %}
 Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
 {% else %}

roles/koji_hub/templates/web.conf.j2

@@ -42,8 +42,8 @@ loginDisabled = True
 KojiHubCA = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 
 {% if env == 'staging' %}
-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
 {% elif koji_instance == "primary"  %}
 Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild
 ParentTasks = flatpakBuild,osbuildImage,kiwiBuild