From 506824d2f834ff658283895f1d6989a7a884fd84 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Jun 17 2020 20:20:52 +0000 Subject: alt: cloud: pull aarch64 info from fedimg, remove x86_64 standard images This commit removes the standarm images for x86_64 so that we now only have one x86_64 image and one aarch64 image on the website. It also changes it so that the aarch64 image information is pulled from datagrepper (the messages that were published by fedimg). --- diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py index c5b63b4..4592b56 100755 --- a/alt.fedoraproject.org/build/fedimg_vars.py +++ b/alt.fedoraproject.org/build/fedimg_vars.py @@ -43,17 +43,18 @@ def collect(release): # 1 - transform release vars into an image name we want to query for templates = [ - # 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}.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', + 'X86_64_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', + }), + ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.aarch64", { + 'AARCH64_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_X86_64_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}.aarch64", { + 'pre_AARCH64_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/alt.fedoraproject.org/data/content/cloud/index.html b/alt.fedoraproject.org/data/content/cloud/index.html index ad6868a..821c83d 100644 --- a/alt.fedoraproject.org/data/content/cloud/index.html +++ b/alt.fedoraproject.org/data/content/cloud/index.html @@ -279,7 +279,6 @@

${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}

-

${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}

@@ -288,16 +287,16 @@
-

${_('GP2 HVM AMIs')}

+

${_('x86_64 AMIs')}

-

${_('Click to launch')}

-