From 3938bd35e26c88f1a601e328563302e2a9462e33 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jan 27 2025 23:27:58 +0000 Subject: koji: some more containerbuild removal cleanup Signed-off-by: Kevin Fenzi --- diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index e917507..83cc2b8 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -113,11 +113,11 @@ MissingPolicyOk = False #Plugins = koji-disable-builds-plugin #Plugins = darkserver-plugin {% if env == "staging" %} -Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi +Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi {% elif koji_instance == "primary" %} -Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi +Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi {% else %} -Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi +Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi {% endif %} [policy] diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2 index 68c3dc4..e04dc34 100644 --- a/roles/koji_hub/templates/web.conf.j2 +++ b/roles/koji_hub/templates/web.conf.j2 @@ -37,13 +37,13 @@ loginDisabled = True KojiHubCA = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem {% if env == 'staging' %} -Tasks = buildContainer,createContainer,flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild -ParentTasks = buildContainer,flatpakBuild,osbuildImage,kiwiBuild +Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild +ParentTasks = flatpakBuild,osbuildImage,kiwiBuild {% elif koji_instance == "primary" %} -Tasks = buildContainer,createContainer,flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild -ParentTasks = buildContainer,flatpakBuild,osbuildImage,kiwiBuild +Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild +ParentTasks = flatpakBuild,osbuildImage,kiwiBuild {% else %} -Tasks = buildContainer,createContainer,flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild -ParentTasks = buildContainer,flatpakBuild,osbuildImage,kiwiBuild +Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild +ParentTasks = flatpakBuild,osbuildImage,kiwiBuild {% endif %} ToplevelTasks = flatpakBuild,osbuildImage