Enabling epel8 in bodhi

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

roles/bodhi2/backend/templates/pungi.rpm.conf.j2

@@ -9,19 +9,11 @@ old_composes_per_release_type = True
 
 # GENERAL SETTINGS
 comps_file = {
-{% if env != "staging" %}
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'master', # defaults to cvs/HEAD or git/master
     'file': 'comps-[[ release.branch ]].xml',
     'command': 'make',
-{% else %}
-    'scm': 'git',
-    'repo': 'https://pagure.io/forks/mohanboddu/fedora-comps.git',
-    'branch': 'epel8',
-    'file': 'comps-[[ release.branch ]].xml',
-    'command': 'make',
-{% endif %}
 }
 variants_file='variants.xml'
 sigkeys = [
@@ -41,11 +33,11 @@ sigkeys = [
     '0608b895',
 [% elif release.version_int == 7 %]
     '352C64E5',
-[% endif %]
-{% if env == "staging" %}
-[% if release.version_int == 8 %]
+[% elif release.version_int == 8 %]
     '2f86d6a1'
 [% endif %]
+{% if env == "staging" %}
+    None
 {% endif %}
 ]
 hashed_directories = True

roles/bodhi2/backend/templates/variants.rpm.xml.j2

@@ -10,17 +10,11 @@
             [% if release.id_prefix == "FEDORA" %]
 	        <arch>armhfp</arch>
 	    [% endif %]
-	    [% if release.version_int >= 26 or release.version_int == 7 %]
+	    [% if release.version_int >= 26 or release.version_int >= 7 %]
 	        <arch>aarch64</arch>
 		<arch>ppc64le</arch>
 	    [% endif %]
-           {% if env == "staging" %}
-	    [% if release.version_int == 8 %]
-	        <arch>aarch64</arch>
-		<arch>ppc64le</arch>
-	    [% endif %]
-           {% endif %}
-	        <arch>s390x</arch>
+	    <arch>s390x</arch>
         </arches>
     </variant>
     <variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">

roles/robosignatory/files/robosignatory.production.py

@@ -260,8 +260,8 @@ config = {
                     "keyid": "34ec9cba"
                 },
                 {
-                    "from": "epel8-pending",
-                    "to": "epel8",
+                    "from": "epel8-signing-pending",
+                    "to": "epel8-testing-pending",
                     "key": "epel-8",
                     "keyid": "2f86d6a1"
                 },