From c2e755a2fe655d0eb38906e7655e44e45664c341 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Nov 13 2017 14:37:36 +0000
Subject: Revert "no AMI prerelease and set a variable to make websites build when we have late AMIs"


We have cloud images for RC 1.6 just fine. No need to special
case them like was done in. 8c4a538

This reverts commit 8c4a538868acfc4b7746deca125d5c8c2bb4fd9c.

---

diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py
index c23f774..94c9434 100755
--- a/alt.fedoraproject.org/build/fedimg_vars.py
+++ b/alt.fedoraproject.org/build/fedimg_vars.py
@@ -44,14 +44,14 @@ def collect(release):
         # The F22 released AMIs uploads didn't appear to go through fedimg, so
         # we can't use this scheme for them.  Stuff for F23 should all go that
         # route though, so we can hopefully switch over soon.
-        ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold_AMI}.x86_64", {
+        ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.x86_64", {
             'HVM_base_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
             'GP2_HVM_base_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}-{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',
-        #}),
+        ("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',
+        }),
     ]
 
     if not os.path.exists('/var/fedora_websites_live_fedimg'):
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index ada2902..c0ccd16 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -29,7 +29,7 @@ release={
     'next_cloud_id': '28',
     'next_atomic_id': '27',
     'next_server_id': '27',
-    'next_cloud_AMI_id': '28',
+    'next_cloud_AMI_id': '27',
     'composedate': '20160616',
     'unofficial_compose': '20160614',
     'alt_composedate': '20161118',
@@ -53,7 +53,6 @@ release={
     'pre_cloud_AMI_atomic_composedate': '20150915',
     'RC_gold': '1.6',             # insert the number of the RC version declared GOLD
     'RC_server_gold': '1.5',      # insert the number of the RC version declared GOLD
-    'RC_gold_AMI': '1.5',         # we do this for late AMIs
     'RC_build': '1.6',            # sometimes releng use the RC build
     'RC_gold_aarch64': '1.6',     # RC Gold for aarch64
     'RC_gold_ppc64': '1.6',       # RC Gold for ppc64