diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index d3b9a04f32..aca637af64 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/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 # diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index b314e3ac3f..d7d6f3291c 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/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(" ") }} diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index cee669a720..d14ce29195 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/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 diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index a4ed74915c..5cc34e0d12 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/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 %} diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2 index b407362462..a3da81aefa 100644 --- a/roles/koji_hub/templates/web.conf.j2 +++ b/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 -ParentTasks = flatpakBuild,osbuildImage,kiwiBuild +Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild +ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild {% elif koji_instance == "primary" %} Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild ParentTasks = flatpakBuild,osbuildImage,kiwiBuild