From 05ddb251c814d164ab56b850d2cfe61e7063937b Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Mar 15 2016 09:55:36 +0000 Subject: Return to manual atomic paths and dates for prerelease There is no 2-week-atomic cycle for Atomic prerelease images Please revert whenever things change in the future --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index dfa9dcb..848a9b0 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -32,6 +32,7 @@ release={ 'atomic_composedate': '20151030', 'pre_cloud_composedate': '20150915', 'pre_cloud_AMI_composedate': '20150915', + 'manual_pre_cloud_composedate': '20160101', # Note that atomic values here get overwritten by the twoweek script. 'pre_cloud_atomic_composedate': '20150915', 'pre_cloud_AMI_atomic_composedate': '20150915', @@ -201,7 +202,12 @@ iso_size={ 'pre_atomic_libvag_cloud': '???', # In MB 'pre_x86_64_docker': '49', # In MB 'pre_VBvag_cloud': '257', # In MB - 'pre_libvag_cloud': '248' # In MB + 'pre_libvag_cloud': '248', # 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 } # Redirect EC2 images diff --git a/getfedora.org/data/content/cloud/prerelease/atomic.html b/getfedora.org/data/content/cloud/prerelease/atomic.html index f8dcacf..ac217f5 100644 --- a/getfedora.org/data/content/cloud/prerelease/atomic.html +++ b/getfedora.org/data/content/cloud/prerelease/atomic.html @@ -79,11 +79,11 @@

${Markup(_('Atomic %(state)s Images')) % {'state': global_variables.release['curr_state']}}

${_('Fedora Atomic represents the leading edge of Project Atomic development. The images published here showcase that work. Note that the images have passed several levels of automated testing, but are not always subjected to manual testing by the QA team.')}

${Markup(_('Please test before using new versions in production. If you do discover a problem, the Atomic tools make it easy to flip back to an earlier release — and if that happens, please also help us by <a href="%s">filing bugs</a> or <a href="%s">submitting fixes</a>.' % ('http://www.projectatomic.io/community/', 'https://github.com/projectatomic/')))}

-

${_('Fedora Atomic Host images are updated roughly every two weeks, rather than on the main six-month Fedora cadence. Because development is moving quickly, only the latest major Fedora release is supported.')}

-

${Markup(_('Note that different Fedora Atomic Host media are subject to different levels of automatic testing. We are making continuous improvements to these tests; <a href="%s">click here</a> to see the current test status.' % 'https://apps.fedoraproject.org/autocloud/jobs/'))}

+

${Markup(_('You can learn more about the Atomic project at <a href="%s">projectatomic.io</a>.') % ('http://projectatomic.io/'))}

-

${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(pre_cloud_atomic_age)s. 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 %(pre_cloud_atomic_age)s.') % global_variables.release)}

+

${_('Atomic Image')}

@@ -92,14 +92,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_id'], 'state': global_variables.release['curr_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_id'], 'state': global_variables.release['curr_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']}

@@ -116,12 +116,12 @@ @@ -138,14 +138,14 @@
${_('VirtualBox Image')}

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

- ${_('VirtualBox Image')} -

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

+ ${_('VirtualBox Image')} +

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

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

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

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

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

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

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

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