From 1a69434b48b9d13825036b2eb93bc3f141eaa70c Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Fri, 15 Nov 2019 19:03:52 +0000
Subject: [PATCH] Enabling module composes for epel8 in bodhi

Also, enabling signing for modules

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 .../backend/templates/pungi.module.conf.j2      | 17 ++++++++++++++---
 .../templates/robosignatory.toml.j2             | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2
index d6571fbd3f..feeb320d3e 100644
--- a/roles/bodhi2/backend/templates/pungi.module.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2
@@ -20,14 +20,25 @@ sigkeys = [
 	'3c3359c4',
 [% endif %]
 {% if env == "staging" %}
-	None
+    [% if release.version_int == 8 %]
+        'd300e724',
+    [% endif %]
 {% endif %}
 ]
 
 module_defaults_dir = {
     'scm': 'git',
-    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'f[[ release.version_int ]]',
+    {% if env == "staging" %}
+        'repo': 'https://pagure.io/modularity/fedora-stg-module-defaults.git',
+        [% if release.version_int == 8 %]
+            'branch': 'el[[ release.version_int ]]',
+        [% else %]
+            'branch': 'f[[ release.version_int ]]',
+        [% endif %]
+    {% else %}
+        'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+        'branch': 'f[[ release.version_int ]]',
+    {% endif %}
     'dir': '.'
 }
 
diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 2df04d3ce2..8126648c99 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -257,6 +257,21 @@ handlers = ["console"]
             keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}"
             type = "modular"
 
+            #epel8 modular tags
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "epel8-modular-signing-pending"
+            to = "epel8-modular-updates-testing-pending"
+            key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('2f86d6a1', 'd300e724') }}"
+            type = "modular"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "el8_playground-modular-updates-candidate"
+            to = "epel8-playground-modular"
+            key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('2f86d6a1', 'd300e724') }}"
+            type = "modular"
+
             # Gated bodhi updates
 
             [[consumer_config.koji_instances.primary.tags]]