From 2b15424c6222ce402b235d3c925e1abc9b76bc05 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 24 2016 21:10:39 +0000
Subject: fix up AMI prerelease script and RC Gold variable to gather the right AMIs


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 4cad05f..b811d51 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -26,7 +26,7 @@ release={
     'next_ppc64_id': '24',
     'next_s390_id': '24',
     'next_cloud_id': '24',
-    'next_cloud_AMI_id': '23',
+    'next_cloud_AMI_id': '24',
     'composedate': '20151030',
     # Note that atomic values here get overwritten by the twoweek script.
     'atomic_composedate': '20151030',
@@ -39,7 +39,7 @@ release={
     'pre_cloud_atomic_composedate': '20150915',
     'pre_cloud_AMI_atomic_composedate': '20150915',
     'RC_gold': '10',              # insert the number of the RC version declared GOLD
-    'RC_pre_gold': '1',           # insert the number of the prerelease RC version declared GOLD
+    'RC_pre_gold': '7',           # insert the number of the prerelease RC version declared GOLD
 
     'atomic_freshness': False,
     'atomic_age': '???',
diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py
index 50235e6..a37636f 100755
--- a/getfedora.org/build/fedimg_vars.py
+++ b/getfedora.org/build/fedimg_vars.py
@@ -85,7 +85,7 @@ def collect(release):
             'HVM_atomic_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
             'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',
         }),
-        ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{pre_cloud_AMI_composedate}.x86_64", {
+        ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", {
             'pre_HVM_base_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
             'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',
             'pre_PV_base_AMI':      lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard',