From 42d787d4f81120d7391a0dd34c92f6ded9390a66 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 12 Feb 2020 18:48:54 +0000
Subject: [PATCH] re-enable f32 signing, clean up old tags

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../templates/robosignatory.toml.j2           | 61 +++++--------------
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 3caee2b8f7..7b2c3fb375 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -140,12 +140,6 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-30', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('cfc659b9', 'd300e724') }}"
 
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f29-kde"
-            to = "f29-kde"
-            key = "{{ (env == 'production')|ternary('fedora-29', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('429476b4', 'd300e724') }}"
-
             # Infra tags
 
             [[consumer_config.koji_instances.primary.tags]]
@@ -166,12 +160,6 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
 
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f29-infra-candidate"
-            to = "f29-infra-stg"
-            key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
-
             [[consumer_config.koji_instances.primary.tags]]
             from = "f30-infra-candidate"
             to = "f30-infra-stg"
@@ -192,12 +180,6 @@ handlers = ["console"]
 
             # Gated coreos-pool tag
 
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f29-coreos-signing-pending"
-            to = "coreos-pool"
-            key = "{{ (env == 'production')|ternary('fedora-29', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('429476b4', 'd300e724') }}"
-
             [[consumer_config.koji_instances.primary.tags]]
             from = "f30-coreos-signing-pending"
             to = "coreos-pool"
@@ -256,23 +238,23 @@ handlers = ["console"]
             keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
             type = "modular"
 
-#            [[consumer_config.koji_instances.primary.tags]]
-#            from = "f32-signing-pending"
-#            to = "f32-updates-testing-pending"
-#            key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
-#            keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f32-signing-pending"
+            to = "f32-updates-testing-pending"
+            key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
 
-#            [consumer_config.koji_instances.primary.tags.sidetags]
-#            pattern = 'f32-build-side-<seq_id>'
-#            from = '<sidetag>-signing-pending'
-#            to = '<sidetag>-testing-pending'
-#            trusted_taggers = ['bodhi']
+            [consumer_config.koji_instances.primary.tags.sidetags]
+            pattern = 'f32-build-side-<seq_id>'
+            from = '<sidetag>-signing-pending'
+            to = '<sidetag>-testing-pending'
+            trusted_taggers = ['bodhi']
 
-#            [[consumer_config.koji_instances.primary.tags]]
-#            from = "f32-pending"
-#            to = "f32"
-#            key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
-#            keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f32-pending"
+            to = "f32"
+            key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f32-modular-pending"
@@ -331,19 +313,6 @@ handlers = ["console"]
             keyid = "{{ (env == 'production')|ternary('cfc659b9', 'd300e724') }}"
             type = "modular"
 
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f29-modular-signing-pending"
-            to = "f29-modular-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-29', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('429476b4', 'd300e724') }}"
-            type = "modular"
-
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f29-signing-pending"
-            to = "f29-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-29', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('429476b4', 'd300e724') }}"
-
             [[consumer_config.koji_instances.primary.tags]]
             from = "epel8-signing-pending"
             to = "epel8-testing-pending"