From e0287983f1c47ac4c9c0bb6b45a68082d863fe2f Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Apr 02 2017 20:49:03 +0000 Subject: add EC2 AMIs to alt.fpo prerelease page and make them mobile friendly --- diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py index d91db42..8c76c7d 100755 --- a/alt.fedoraproject.org/build/fedimg_vars.py +++ b/alt.fedoraproject.org/build/fedimg_vars.py @@ -81,6 +81,12 @@ def collect(release): 'PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard', 'GP2_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2', }), + ("Fedora-Cloud-Base-{next_cloud_AMI_id}-{manual_pre_cloud_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', + 'pre_GP2_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2', + }), ] for template, buckets in templates: diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html index 21c08d4..3d13b14 100644 --- a/alt.fedoraproject.org/data/content/prerelease/index.html +++ b/alt.fedoraproject.org/data/content/prerelease/index.html @@ -538,7 +538,7 @@

${_('raw image')}

-

${Markup(_('%sMB raw.xz image')) % global_variables.iso_size['pre_raw_x86_64_cloud']}

+

${Markup(_('%sMB raw.xz')) % global_variables.iso_size['pre_raw_x86_64_cloud']}

${_('Download')} | ${_('Verify')}

@@ -552,7 +552,7 @@

${_('qcow2 image')}

-

${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['pre_qcow2_x86_64_cloud']}

+

${Markup(_('%sMB qcow2')) % global_variables.iso_size['pre_qcow2_x86_64_cloud']}

${_('Download')} | ${_('Verify')}

@@ -566,7 +566,7 @@

${_('VirtualBox image')}

-

${Markup(_('%sMB vbox image')) % global_variables.iso_size['pre_VBvag_cloud']}

+

${Markup(_('%sMB vbox')) % global_variables.iso_size['pre_VBvag_cloud']}

${_('Download')} | ${_('Verify')}

@@ -580,12 +580,162 @@

${_('libvirt/KVM image')}

-

${Markup(_('%sMB libvirt image')) % global_variables.iso_size['pre_libvag_cloud']}

+

${Markup(_('%sMB libvirt')) % global_variables.iso_size['pre_libvag_cloud']}

${_('Download')} | ${_('Verify')}

+ +
+
+ +
+
+

${_('GP2 HVM AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard HVM AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('GP2 PV AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard PV AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+ @@ -641,6 +791,148 @@

${_('Download')} | ${_('Verify')}

+ +
+
+ +
+
+

${_('GP2 HVM AMIs')}

+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard HVM AMIs')}

+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('GP2 PV AMIs')}

+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard PV AMIs')}

+

${_('Click to launch')}

+ +
+
+ @@ -703,6 +995,156 @@

${_('Download')} | ${_('Verify')}

+ +
+
+ +
+
+

${_('GP2 HVM AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard HVM AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('GP2 PV AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+
+
+ +
+
+

${_('Standard PV AMIs')}

+
+
+

${_('Click to launch')}

+ +
+
+ diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 0b942c0..ad00c51 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -40,7 +40,7 @@ release={ 'cloud_AMI_composedate': '20160616', 'pre_cloud_AMI_composedate': '20160507', 'manual_cloud_composedate': '20160616', - 'manual_pre_cloud_composedate': '20160101', + 'manual_pre_cloud_composedate': '20170330', 'manual_pre_cloud_atomic_composedate': '20160101', 'manual_pre_cloud_AMI_atomic_composedate': '20160101', # Note that atomic values here get overwritten by the twoweek script.