From 101c97a840a9063260ad082b7474415b8d868268 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: May 07 2016 15:32:21 +0000
Subject: fix our AMI ID script to gather the right IDs for F24 Beta


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 97a490d..feede44 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -31,7 +31,7 @@ release={
     # Note that atomic values here get overwritten by the twoweek script.
     'atomic_composedate': '20151030',
     'pre_cloud_composedate': '20150915',
-    'pre_cloud_AMI_composedate': '20150915',
+    'pre_cloud_AMI_composedate': '20160507',
     'manual_pre_cloud_composedate': '20160101',
     'manual_pre_cloud_atomic_composedate': '20160101',
     'manual_pre_cloud_AMI_atomic_composedate': '20160101',
diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py
index b7beab3..862e606 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}-{RC_pre_gold}.x86_64", {
+        ("Fedora-Cloud-Base-{next_cloud_AMI_id}-{pre_cloud_AMI_composedate}.n.0.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',