From 6828a43cbedc10416ecb8d4fd56add61d60496e0 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 15 2016 17:11:16 +0000
Subject: make fedimg grep also for prerelease AMIs


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 848a9b0..4cad05f 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -33,6 +33,8 @@ release={
     'pre_cloud_composedate': '20150915',
     'pre_cloud_AMI_composedate': '20150915',
     'manual_pre_cloud_composedate': '20160101',
+    'manual_pre_cloud_atomic_composedate': '20160101',
+    'manual_pre_cloud_AMI_atomic_composedate': '20160101',
     # Note that atomic values here get overwritten by the twoweek script.
     'pre_cloud_atomic_composedate': '20150915',
     'pre_cloud_AMI_atomic_composedate': '20150915',
diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py
index da9e762..50235e6 100755
--- a/getfedora.org/build/fedimg_vars.py
+++ b/getfedora.org/build/fedimg_vars.py
@@ -85,16 +85,16 @@ 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", {
-        #    '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',
-        #    'pre_GP2_PV_base_AMI':  lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2',
-        #}),
-        #("Fedora-Cloud-Atomic-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{pre_cloud_AMI_atomic_composedate}.x86_64", {
-        #    'pre_HVM_atomic_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
-        #    'pre_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", {
+            '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',
+            'pre_GP2_PV_base_AMI':  lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2',
+        }),
+        ("Fedora-Cloud-Atomic-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{manual_pre_cloud_AMI_atomic_composedate}.x86_64", {
+            'pre_HVM_atomic_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
+            'pre_GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',
+        }),
     ]
 
     for template, buckets in templates: