From 2eb3f573708e433945869cea5d941da9eeb066f2 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Mon, 23 Oct 2017 20:12:46 +0200
Subject: [PATCH] Make the pungi configs for staging instead

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 ....module.conf.j2 => staging-pungi.module.conf.j2} |  4 ++--
 ...{pungi.rpm.conf.j2 => staging-pungi.rpm.conf.j2} | 13 +++++++------
 ...module.xml.j2 => staging-variants.module.xml.j2} |  0
 ...iants.rpm.xml.j2 => staging-variants.rpm.xml.j2} |  0
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename roles/bodhi2/backend/files/{pungi.module.conf.j2 => staging-pungi.module.conf.j2} (93%)
 rename roles/bodhi2/backend/files/{pungi.rpm.conf.j2 => staging-pungi.rpm.conf.j2} (95%)
 rename roles/bodhi2/backend/files/{variants.module.xml.j2 => staging-variants.module.xml.j2} (100%)
 rename roles/bodhi2/backend/files/{variants.rpm.xml.j2 => staging-variants.rpm.xml.j2} (100%)

diff --git a/roles/bodhi2/backend/files/pungi.module.conf.j2 b/roles/bodhi2/backend/files/staging-pungi.module.conf.j2
similarity index 93%
rename from roles/bodhi2/backend/files/pungi.module.conf.j2
rename to roles/bodhi2/backend/files/staging-pungi.module.conf.j2
index 5cc745afed..e977131e23 100644
--- a/roles/bodhi2/backend/files/pungi.module.conf.j2
+++ b/roles/bodhi2/backend/files/staging-pungi.module.conf.j2
@@ -10,7 +10,7 @@ release_type = 'updates'
 bootable = False
 
 variants_file='module-variants.xml'
-sigkeys = ['a3cc4e62']
+sigkeys = ['a3cc4e62', None]
 
 hashed_directories = True
 
@@ -18,7 +18,7 @@ hashed_directories = True
 runroot = False
 
 # PDC settings
-pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_url = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
 pdc_insecure = False
 pdc_develop = True
 
diff --git a/roles/bodhi2/backend/files/pungi.rpm.conf.j2 b/roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2
similarity index 95%
rename from roles/bodhi2/backend/files/pungi.rpm.conf.j2
rename to roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2
index 6cdd26ea07..d8920500e3 100644
--- a/roles/bodhi2/backend/files/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2
@@ -17,16 +17,17 @@ comps_file = {
 variants_file='variants.xml'
 sigkeys = [
 {% release.version_int == 25 %}
-	'fdb19c98'
+	'fdb19c98',
 {% elif release.version_int == 26 %}
-	'64dab85d'
+	'64dab85d',
 {% elif release.version_int == 27 %}
-	'f5282ee4'
+	'f5282ee4',
 {% elif release.version_int == 6 %}
-	'0608b895'
+	'0608b895',
 {% elif release.version_int == 7 %}
-	'352C64E5'
+	'352C64E5',
 {% endif %}
+	None
 ]
 hashed_directories = True
 
@@ -123,7 +124,7 @@ ostree = [
 {% endif %}
 
 translate_paths = [
-   ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
+   ('/mnt/koji/compose/', 'https://kojipkgs.stg.fedoraproject.org/compose/'),
 ]
 koji_profile = 'bodhi_koji'
 link_type = 'hardlink-or-copy'
diff --git a/roles/bodhi2/backend/files/variants.module.xml.j2 b/roles/bodhi2/backend/files/staging-variants.module.xml.j2
similarity index 100%
rename from roles/bodhi2/backend/files/variants.module.xml.j2
rename to roles/bodhi2/backend/files/staging-variants.module.xml.j2
diff --git a/roles/bodhi2/backend/files/variants.rpm.xml.j2 b/roles/bodhi2/backend/files/staging-variants.rpm.xml.j2
similarity index 100%
rename from roles/bodhi2/backend/files/variants.rpm.xml.j2
rename to roles/bodhi2/backend/files/staging-variants.rpm.xml.j2