From e46308a1a2f087ba09009f4a2c4592b9e2ffcf0b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Aug 16 2024 07:49:40 +0000
Subject: Switch to rpmautospec mock plugin in prod


Signed-off-by: Nils Philippsen <nils@redhat.com>

---

diff --git a/roles/bkernel/templates/bkernel-site-defaults.cfg b/roles/bkernel/templates/bkernel-site-defaults.cfg
index 71ebd36..f48419d 100644
--- a/roles/bkernel/templates/bkernel-site-defaults.cfg
+++ b/roles/bkernel/templates/bkernel-site-defaults.cfg
@@ -16,10 +16,8 @@ config_opts["dnf5_avoid_opts"] = {
     "group": ["--allowerasing"],
 }
 
-{% if env == "staging" %}
 config_opts['plugin_conf']['rpmautospec_enable'] = True
 config_opts['plugin_conf']['rpmautospec_opts'] = {
     'requires': ['rpmautospec'],
     'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
 }
-{% endif %}
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 7721e55..97f3ac6 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -101,16 +101,6 @@
 # rpmautospec plugin
 #
 
-- name: install koji builder rpmautospec plugin
-  package:
-    name: koji-builder-plugin-rpmautospec
-    state: present
-  when: env != 'staging'
-  tags:
-  - packages
-  - koji_builder
-  - rpmautospec
-
 - name: remove koji builder rpmautospec plugin
   package:
     name:
@@ -118,7 +108,6 @@
       - python3-rpmautospec
       - rpmautospec
     state: absent
-  when: env == 'staging'
   tags:
   - packages
   - koji_builder
diff --git a/roles/koji_builder/templates/builders/site-defaults.cfg b/roles/koji_builder/templates/builders/site-defaults.cfg
index a9bde1d..d4d623f 100644
--- a/roles/koji_builder/templates/builders/site-defaults.cfg
+++ b/roles/koji_builder/templates/builders/site-defaults.cfg
@@ -28,10 +28,8 @@ config_opts["dnf5_avoid_opts"] = {
     "group": ["--allowerasing"],
 }
 
-{% if env == "staging" %}
 config_opts['plugin_conf']['rpmautospec_enable'] = True
 config_opts['plugin_conf']['rpmautospec_opts'] = {
     'requires': ['rpmautospec'],
     'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
 }
-{% endif %}
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 3e1e344..1c901b4 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -112,10 +112,6 @@ keytab = /etc/kojid/kojid.keytab
 {{ plugins.append("builder_containerbuild") }}
 {% endif %}
 
-{% if env != 'staging' %}
-{{ plugins.append("rpmautospec_builder") }}
-{% endif %}
-
 {{ plugins.append("osbuild") }}
 
 {{ plugins.append("scmpolicy") }}