From d1dde67ae7747c2e5cb4b3f1b6cee19b38597553 Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@redhat.com>
Date: Dec 10 2018 17:29:57 +0000
Subject: Include Atomic Host aarch64 AMIs


Signed-off-by: Sinny Kumari <sinny@redhat.com>

---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 80d05f6..487f572 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -340,6 +340,14 @@ EC2_regions = [
     region(u'Canada (Central)',                u'Central',      u'ca-central-1')
 ]
 
+# regions where aarch64 EC2 instances are available
+aarch64_EC2_regions = [
+    region(u'US East (N. Virginia)',           u'Virginia',     u'us-east-1'),
+    region(u'US East (Ohio)',                  u'Ohio',         u'us-east-2'),
+    region(u'US West (Oregon)',                u'Oregon',       u'us-west-2'),
+    region(u'EU West (Ireland)',               u'Ireland',      u'eu-west-1'),
+]
+
 path_stats={
     'path': 'https://redirect.fedoraproject.org/console.aws.amazon.com/ec2/v2',
 }
@@ -437,6 +445,8 @@ GP2_HVM_atomic_AMI={
     #'sa-east-1':        'ami-8509b1e9'      # Sao Paolo
 }
 
+AARCH64_GP2_HVM_atomic_AMI={}
+
 # EC2 AMI IDs PRERELEASE!!!
 pre_HVM_base_AMI={
     'eu-west-2':       'ami-0a2cafce4e146fa6f',
diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py
index f8ac7ad..24707dc 100755
--- a/getfedora.org/build/fedimg_vars.py
+++ b/getfedora.org/build/fedimg_vars.py
@@ -54,6 +54,9 @@ 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-AtomicHost-{curr_atomic_id}-{atomic_composedate}.aarch64", {
+            'AARCH64_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", {
         #    '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',
diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html
index 6dbd017..49f748c 100644
--- a/getfedora.org/data/content/atomic/download/index.html
+++ b/getfedora.org/data/content/atomic/download/index.html
@@ -69,7 +69,7 @@
                 <div class="row">
                   <div class="col-xs-10">
                     <h5 class="bold">
-                      ${_('GP2 Format HVM AMIs')}
+                      ${_('GP2 Format HVM AMIs (x86_64)')}
                    </h5>
                   </div>
                   <div class="col-xs-2 text-right">
@@ -101,7 +101,7 @@
               <div class="list-group-item">
                 <div class="row">
                   <div class="col-xs-10">
-                    <h5 class="bold">${_('Standard Format HVM AMIs')}</h5>
+                    <h5 class="bold">${_('Standard Format HVM AMIs (x86_64)')}</h5>
                   </div>
                   <div class="col-xs-2 text-right">
                     <a href="javascript:void(0)" class="btn btn-success reveal-link download-cloud download-cloud-sm" data-target="standardami-reveal-link" role="button" title="${_('GP2 HVM AMIs')}">
@@ -129,6 +129,39 @@
                   </div>
                 </div>
               </div>
+              <div class="list-group-item">
+                <div class="row">
+                  <div class="col-xs-10">
+                    <h5 class="bold">
+                      ${_('GP2 Format HVM AMIs (aarch64)')}
+                   </h5>
+                  </div>
+                  <div class="col-xs-2 text-right">
+                    <a href="javascript:void(0)" class="btn btn-success reveal-link download-cloud download-cloud-sm" data-target="aarch64-gp2-reveal-link" role="button" title="${_('GP2 HVM AMIs')}">
+                      <span class="fa fa-fw fa-caret-down" aria-hidden="true"></span>
+                    </a>
+                  </div>
+                  <div id="aarch64-gp2-reveal-link" class="col-xs-12" style="display: none;">
+                    <p>${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}</p>
+                    <table class="table table-hover">
+                      <thead>
+                        <tr>
+                          <th>${_('Region')}</th>
+                          <th class="hidden-xs">${_('AMI ID')}</th>
+                          <th>${_('Launch')}</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr py:for="r in global_variables.aarch64_EC2_regions">
+                          <td py:if="r.code in global_variables.AARCH64_GP2_HVM_atomic_AMI">${_(r.long)}</td>
+                          <td py:if="r.code in global_variables.AARCH64_GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.AARCH64_GP2_HVM_atomic_AMI[r.code]}</td>
+                          <td py:if="r.code in global_variables.AARCH64_GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.AARCH64_GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </div>