From 80cba71063fb727846d7415ca57e0ab9a84a3111 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Tue, 31 Mar 2020 12:27:18 +0200
Subject: [PATCH] koji-builders: install and configure the rpmautospec plugin

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/koji_builder/tasks/main.yml       | 14 ++++++++++++++
 roles/koji_builder/templates/kojid.conf | 17 +++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 48735cb6f5..f80c126727 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -96,6 +96,20 @@
   tags:
   - koji_builder
 
+#
+# rpmautospec plugin
+#
+
+- name: install koji builder rpmautospec plugin
+  package: name={{ item }} state=present
+  with_items:
+  - koji-builder-plugin-rpmautospec
+  when: env == 'staging'
+  tags:
+  - packages
+  - koji_builder
+  - rpmautospec
+
 - name: Install arm UEFI firmware package (aarch64 only)
   package: name=edk2-arm state=present
   tags:
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 2800760136..8d320c7e0a 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -143,16 +143,21 @@ keytab = /etc/kojid/kojid.keytab
 krbservice = host
 krb_rdns = false
 
-{% if 'runroot' in group_names %}
-; Config for it lives in /etc/kojid/runroot.conf
-plugins = runroot
+{% set plugins = [] %}
 
+{% if 'runroot' in group_names %}
+{% set plugins = ['runroot'] %}
 {% else %}
 
 {% if ansible_architecture == 'x86_64' and not inventory_hostname.startswith('bkernel') %}
-plugins = builder_containerbuild
-{% else %}
-plugins =
+{% set plugins = ['builder_containerbuild'] %}
 {% endif %}
 
 {% endif %}
+
+{% if env == 'staging' %}
+{% set plugins.append("rpmautospec_builder") %}
+{% endif %}
+
+; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
+plugins = {{ plugins | join(" ") }}