From 4cf07e1f6c3caa1c0dd7149ec49e5079a6259b6e Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 16 Oct 2017 17:12:15 +0000
Subject: [PATCH] Be explicit about these tags.

---
 roles/mbs/common/templates/config.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py
index af104e6510..dcd0c6bd5d 100644
--- a/roles/mbs/common/templates/config.py
+++ b/roles/mbs/common/templates/config.py
@@ -138,12 +138,6 @@ class ProdConfiguration(BaseConfiguration):
     SCMURLS = ['git://pkgs.stg.fedoraproject.org/modules/',
                'https://src.stg.fedoraproject.org/modules/']
 
-    KOJI_ENABLE_CONTENT_GENERATOR = True
-
-    # See https://pagure.io/releng/issue/7012
-    BASE_MODULE_NAMES = set(['platform', 'bootstrap'])
-    KOJI_CG_BUILD_TAG_TEMPLATE = "{}-modular-updates-candidate"
-    KOJI_CG_DEFAULT_BUILD_TAG = "modular-updates-candidate"
 {% else %}
     KOJI_PROFILE = 'production'
     KOJI_ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64', 'ppc64le', 'x86_64', 's390x']
@@ -152,10 +146,15 @@ class ProdConfiguration(BaseConfiguration):
     PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'
     SCMURLS = ['git://pkgs.fedoraproject.org/modules/',
                'https://src.fedoraproject.org/modules/']
-    # Made possible by https://pagure.io/releng/issue/6799
-    KOJI_ENABLE_CONTENT_GENERATOR = True
 {% endif %}
 
+    # Made possible by https://pagure.io/releng/issue/6799
+    KOJI_ENABLE_CONTENT_GENERATOR = True
+
+    # See https://pagure.io/releng/issue/7012
+    BASE_MODULE_NAMES = set(['platform', 'bootstrap'])
+    KOJI_CG_BUILD_TAG_TEMPLATE = "{}-modular-updates-candidate"
+    KOJI_CG_DEFAULT_BUILD_TAG = "modular-updates-candidate"
 
     # This is a whitelist of prefixes of koji tags we're allowed to manipulate
     KOJI_TAG_PREFIXES = [