From 85bc62a27fefe8689c8d87f18446b8b591acf5fd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Apr 01 2017 17:15:39 +0000 Subject: 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'])})} - -