From 45901eb3fc4957addc63917246b1e2fefe3c7cc5 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 1/6] atomic: update prelease page with atomic urls --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 0186966..e5c6449 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -66,6 +66,11 @@ release={ 'atomic_age': '???', 'pre_cloud_atomic_freshness': False, 'pre_cloud_atomic_age': '???', + 'manual_pre_atomic_iso_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/Atomic/x86_64/iso/Fedora-Atomic-ostree-x86_64-26-20170331.n.0.iso', + 'manual_pre_atomic_qcow2_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Atomic-26-20170331.n.0.x86_64.qcow2', + 'manual_pre_atomic_raw_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Atomic-26-20170331.n.0.x86_64.raw.xz', + 'manual_pre_atomic_VBvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-virtualbox.box', + 'manual_pre_atomic_libvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-libvirt.box', } path={ @@ -262,10 +267,11 @@ iso_size={ 'pre_VBvag_cloud': '237', # In MB 'pre_libvag_cloud': '227', # In MB # Manual atomic prerelease image sizes go here. - 'manual_pre_atomic_raw_cloud': '100', # In MB - 'manual_pre_atomic_qcow2_cloud': '200', # In MB - 'manual_pre_atomic_VBvag_cloud': '300', # In MB - 'manual_pre_atomic_libvag_cloud': '400', # In MB + 'manual_pre_atomic_raw_cloud': '446', # In MB + 'manual_pre_atomic_qcow2_cloud': '551', # In MB + 'manual_pre_atomic_VBvag_cloud': '539', # In MB + 'manual_pre_atomic_libvag_cloud': '529', # In MB + 'manual_pre_atomic_iso': '854', # In MB # Everything release 'x86_64_ev': '477', #In MB 'i386_ev': '465', #In MB diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index 7043faa..2d8db7a 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -223,14 +223,14 @@
${_('VirtualBox Image')}

${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}

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

${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

- ${_('Download')} -

${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}

+ ${_('Download')} +

${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['manual_pre_atomic_libvag_cloud']}

@@ -247,12 +247,12 @@ @@ -292,14 +292,14 @@
${_('qcow2 Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

- ${_('Download')} -

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}

+ ${_('Download')} +

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['manual_pre_atomic_qcow2_cloud']}

${_('Raw Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

- ${_('Download')} -

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}

+ ${_('Download')} +

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['manual_pre_atomic_raw_cloud']}

@@ -315,12 +315,12 @@ @@ -332,7 +332,7 @@

${_('Other Downloads')}

From a8701a54a6bd18c0c2be5b8062fa167f794841f0 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 2/6] atomic: update prerelease page with AMI information --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index e5c6449..94bdc3a 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -432,25 +432,25 @@ pre_GP2_PV_base_AMI={ } pre_HVM_atomic_AMI={ - #'us-east-1': 'ami-7d1a6c18', # Virginia - #'us-west-2': 'ami-c5f5eaf5', # Oregon - #'us-west-1': 'ami-2945806d', # California - #'eu-west-1': 'ami-b5b895c2', # Ireland - #'eu-central-1': 'ami-b28eb0af', # Frankfurt - #'ap-southeast-1': 'ami-9e9683cc', # Singapore - #'ap-northeast-1': 'ami-28d04628', # Tokyo - #'ap-southeast-2': 'ami-2f165815', # Sydney - #'sa-east-1': 'ami-9b0c9986' # Sao Paolo + 'us-east-1': 'ami-0fff7a19', # Virginia + 'us-west-2': 'ami-f12abe91', # Oregon + 'us-west-1': 'ami-2f0e544f', # California + 'eu-west-1': 'ami-8dbe81eb', # Ireland + 'eu-central-1': 'ami-ddc515b2', # Frankfurt + 'ap-southeast-1': 'ami-9ffd42fc', # Singapore + 'ap-northeast-1': 'ami-15785c72', # Tokyo + 'ap-southeast-2': 'ami-afd7d8cc', # Sydney + 'sa-east-1': 'ami-c81370a4' # Sao Paolo } pre_GP2_HVM_atomic_AMI={ - #'us-east-1': 'ami-bf1d6bda', # Virginia - #'us-west-2': 'ami-e9f5ead9', # Oregon - #'us-west-1': 'ami-23458067', # California - #'eu-west-1': 'ami-c7b895b0', # Ireland - #'eu-central-1': 'ami-ac8eb0b1', # Frankfurt - #'ap-southeast-1': 'ami-909683c2', # Singapore - #'ap-northeast-1': 'ami-12d54312', # Tokyo - #'ap-southeast-2': 'ami-3716580d', # Sydney - #'sa-east-1': 'ami-9d0c9980' # Sao Paolo + 'us-east-1': 'ami-1efe7b08', # Virginia + 'us-west-2': 'ami-832abee3', # Oregon + 'us-west-1': 'ami-a40e54c4', # California + 'eu-west-1': 'ami-2fbb8449', # Ireland + 'eu-central-1': 'ami-0bc61664', # Frankfurt + 'ap-southeast-1': 'ami-b7fa45d4', # Singapore + 'ap-northeast-1': 'ami-f3795d94', # Tokyo + 'ap-southeast-2': 'ami-17d5da74', # Sydney + 'sa-east-1': 'ami-881370e4' # Sao Paolo } diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index 2d8db7a..f90d48e 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -88,9 +88,9 @@ - ${_(r.long)} - ${global_variables.GP2_HVM_atomic_AMI[r.code]} - + ${_(r.long)} + ${global_variables.pre_GP2_HVM_atomic_AMI[r.code]} + @@ -120,9 +120,9 @@ - ${_(r.long)} - ${global_variables.HVM_atomic_AMI[r.code]} - + ${_(r.long)} + ${global_variables.pre_HVM_atomic_AMI[r.code]} + @@ -164,9 +164,9 @@ - ${_(r.long)} - ${global_variables.GP2_HVM_atomic_AMI[r.code]} - + ${_(r.long)} + ${global_variables.pre_GP2_HVM_atomic_AMI[r.code]} + @@ -194,9 +194,9 @@ - ${_(r.long)} - ${global_variables.HVM_atomic_AMI[r.code]} - + ${_(r.long)} + ${global_variables.pre_HVM_atomic_AMI[r.code]} + From 85bc62a27fefe8689c8d87f18446b8b591acf5fd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 3/6] atomic: no atomic/beta for atomic host we will go with "Pre-Release" as the state for now --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 94bdc3a..7d0cca8 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -12,7 +12,7 @@ release={ 'curr_alt_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_AMI_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_atomic_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_atomic_state': 'Pre-Release', # No Alpha/Beta for Atomic Host 'prev_arm_id': '24', 'prev_alt_id': '24', 'prev_cloud_id': '24', @@ -71,6 +71,7 @@ release={ 'manual_pre_atomic_raw_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Atomic-26-20170331.n.0.x86_64.raw.xz', 'manual_pre_atomic_VBvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-virtualbox.box', 'manual_pre_atomic_libvag_cloud_url': 'https://kojipkgs.fedoraproject.org/compose/branched/Fedora-26-20170331.n.0/compose/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-26-20170331.n.0.x86_64.vagrant-libvirt.box', + 'manual_pre_atomic_date': '20170331', } path={ diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html index 4c6e9e9..217717e 100644 --- a/getfedora.org/data/content/atomic/download/index.html +++ b/getfedora.org/data/content/atomic/download/index.html @@ -343,23 +343,13 @@

${Markup(_('Join the Project Atomic channel <strong>#atomic</strong></a> on <strong>irc.freenode.org</strong></a>.'))}

- +
-
${Markup(_('F%(rel)s Alpha')) % {'rel':global_variables.release['next_atomic_id']}}
+
${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

${_('Try a pre-release')}

${_('We\'re working on our next release.')}
${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_atomic_id']}}

-

${Markup(_('Download F%(rel)s Alpha images')) % {'rel':global_variables.release['next_atomic_id']}}

-

${_('How to test pre-releases')}

-
- - -
-
${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_atomic_id']}}
-

${_('Try a pre-release')}

-

${_('We\'re working on our next release.')}
- ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_atomic_id']}}

-

${Markup(_('Download F%(rel)s Beta images')) % {'rel':global_variables.release['next_atomic_id']}}

+

${Markup(_('Download F%(rel)s %(state)s images')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

${_('How to test pre-releases')}

 diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index f90d48e..bddcba4 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -34,7 +34,7 @@

${Markup(_('Download Fedora %(rel)s %(state)s Atomic Host')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}

${_('Atomic Host is built every 2 weeks or so.')}

${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(atomic_age)s days ago. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}

-

${Markup(_('These are the latest official Fedora Atomic Host images, produced %(atomic_age)s days ago.') % global_variables.release)}

+

${Markup(_('These are the latest Fedora Atomic Host images, produced on %(manual_pre_atomic_date)s.') % global_variables.release)}

@@ -47,12 +47,6 @@

${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})} ${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})} - - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})} - -

From 6ae015b7645094b63dbc1d17ab539705a65c7739 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 4/6] atomic: fix prerel spash screen page for iso Not sure why, but the download splash screen wasn't working so I just disabled it. --- diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index bddcba4..3aa5312 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -326,7 +326,7 @@

${_('Other Downloads')}

From f15c7b088b65f01cdfb7a630232d4573968bc0c9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 5/6] atomic: update vagrant atlas instructions for pre-release --- diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index 3aa5312..c4491cd 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -260,9 +260,9 @@

${_('Vagrant Downloads using Vagrant tools')}

${Markup(_('You can use the following command to grab the Vagrant Box images from <a href="%s">HashiCorp\'s Atlas</a>.') % ('https://atlas.hashicorp.com/fedora'))}

- 
vagrant box add fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host
+ 
vagrant box add fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host

${Markup(_('If you\'ve previously run Fedora %(rel)s Atomic Host in Vagrant on your machine then you can get the latest version by running:')) % {'rel':global_variables.release['curr_atomic_id']}}

- 
vagrant box update --box=fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host
+ 
vagrant box update --box=fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host
From 26f48798ab140457e9d34fcef23efc7dbebbd258 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: [PATCH 6/6] atomic: remove docker/cloud downloads from prerel page --- diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html index c4491cd..e3b2b9c 100644 --- a/getfedora.org/data/content/atomic/prerelease/index.html +++ b/getfedora.org/data/content/atomic/prerelease/index.html @@ -327,8 +327,6 @@

${_('Other Downloads')}

${_('Resources')}

${Markup(_('<a href="https://www.projectatomic.io/docs/quickstart/"><strong>Project Atomic: Getting Started</strong></a>'))}