#672 atomic updates for pre-release images
Merged 2 years ago by robyduck. Opened 2 years ago by dustymabe.
dustymabe/fedora-websites dusty-f26-beta  into  f26-beta

file modified
+30 -29

@@ -66,12 +66,12 @@ 

      'atomic_age': '???',

      'pre_cloud_atomic_freshness': False,

      'pre_cloud_atomic_age': '???',

-     'manual_pre_atomic_iso_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170331.n.0/Fedora-Atomic-ostree-x86_64-26-20170331.n.0.iso',

-     'manual_pre_atomic_qcow2_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170331.n.0/Fedora-Atomic-26-20170331.n.0.x86_64.qcow2',

-     'manual_pre_atomic_raw_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170331.n.0/Fedora-Atomic-26-20170331.n.0.x86_64.raw.xz',

-     'manual_pre_atomic_VBvag_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170331.n.0/Fedora-Atomic-Vagrant-26-20170331.n.0.x86_64.vagrant-virtualbox.box',

-     'manual_pre_atomic_libvag_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170331.n.0/Fedora-Atomic-Vagrant-26-20170331.n.0.x86_64.vagrant-libvirt.box',

-     'manual_pre_atomic_date': '20170331',

+     'manual_pre_atomic_iso_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170611.n.1/Fedora-Atomic-ostree-x86_64-26-20170611.n.1.iso',

+     'manual_pre_atomic_qcow2_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170611.n.1/Fedora-Atomic-26-20170611.n.1.x86_64.qcow2',

+     'manual_pre_atomic_raw_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170611.n.1/Fedora-Atomic-26-20170611.n.1.x86_64.raw.xz',

+     'manual_pre_atomic_VBvag_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170611.n.1/Fedora-Atomic-Vagrant-26-20170611.n.1.x86_64.vagrant-virtualbox.box',

+     'manual_pre_atomic_libvag_cloud_url': 'https://s3.amazonaws.com/fedora-atomic-s3/Fedora-26-20170611.n.1/Fedora-Atomic-Vagrant-26-20170611.n.1.x86_64.vagrant-libvirt.box',

+     'manual_pre_atomic_date': '20170611',

  }

  

  path={

@@ -272,11 +272,12 @@ 

      'pre_VBvag_cloud':         '192',   # In MB

      'pre_libvag_cloud':        '184',   # In MB

      # Manual atomic prerelease image sizes go here.

-     '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

+     'manual_pre_atomic_raw_cloud':    '499',   # In MB

+     'manual_pre_atomic_qcow2_cloud':  '649',   # In MB

+     'manual_pre_atomic_VBvag_cloud':  '629',   # In MB

+     'manual_pre_atomic_libvag_cloud': '614',   # In MB

+     'manual_pre_atomic_iso':          '923',   # In MB

+ 

      # Everything release

      'x86_64_ev':        '477',   #In MB

      'i386_ev':          '465',   #In MB

@@ -437,25 +438,25 @@ 

  }

  

  pre_HVM_atomic_AMI={

-     '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

+     'us-east-1':        'ami-0991cb1f',     # Virginia

+     'us-west-2':        'ami-32b1b84b',     # Oregon

+     'us-west-1':        'ami-17fddf77',     # California

+     'eu-west-1':        'ami-e2d7cb84',     # Ireland

+     'eu-central-1':     'ami-78d17517',     # Frankfurt

+     'ap-southeast-1':   'ami-981596fb',     # Singapore

+     'ap-northeast-1':   'ami-a36b65c4',     # Tokyo

+     'ap-southeast-2':   'ami-cca4b2af',     # Sydney

+     'sa-east-1':        'ami-b591f9d9'      # Sao Paolo

  }

  

  pre_GP2_HVM_atomic_AMI={

-     '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

+     'us-east-1':        'ami-b091cba6',     # Virginia

+     'us-west-2':        'ami-a1b2bbd8',     # Oregon

+     'us-west-1':        'ami-deffddbe',     # California

+     'eu-west-1':        'ami-6bdac60d',     # Ireland

+     'eu-central-1':     'ami-9dd571f2',     # Frankfurt

+     'ap-southeast-1':   'ami-411a9922',     # Singapore

+     'ap-northeast-1':   'ami-6d6c620a',     # Tokyo

+     'ap-southeast-2':   'ami-39a4b25a',     # Sydney

+     'sa-east-1':        'ami-079ff76b'      # Sao Paolo

  }

@@ -46,7 +46,7 @@ 

        <div class="row top-margin">

            <div class="col-xs-12">

                <h2 class="cloudy">${_('Atomic Host Images')}</h2>

-               <p>${_('Fedora Atomic Host is a leading edge base operating system following the Project Atomic model. It is designed around Kubernetes and Docker containers. The images published here showcase that work. Note that the images have passed several levels of automated testing, but are not always subjected to.')}</p>

+               <p>${_('Fedora Atomic Host is a leading edge base operating system following the Project Atomic model. It is designed around Kubernetes and containers. The images published here showcase that work. Note that the images have passed several levels of automated testing.')}</p>

                <ul>

                <li>${Markup(_('&lt;strong&gt;Please test before using new versions in production.&lt;/strong&gt; If you do discover a problem, the Atomic Host tools make it easy to flip back to an earlier release — and if that happens, please also help us by filing bugs or submitting fixes.'))}</li>

                <li>${Markup(_('&lt;strong&gt;Fedora Atomic Host images are updated roughly every two weeks,&lt;/strong&gt; rather than on the main six-month Fedora cadence. Because development is moving quickly, only the latest major Fedora release is supported.'))}</li>

@@ -261,7 +261,7 @@ 

  	              	<h4 class="bold">${_('Vagrant Downloads using Vagrant tools')}</h4>

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

  	                <pre>vagrant box add fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host</pre>

- 	                <p>${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']}}</p>

+ 	                <p>${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['next_atomic_id']}}</p>

  	                <pre>vagrant box update --box=fedora/prerelease-${global_variables.release['next_atomic_id']}-atomic-host</pre>

  	              </div>

  	            </div>

  • atomic: update to latest pre-rel 26 images
  • atomic: fixup the comment about testing.
  • atomic: fix one case where we were using the wrong version

Perfect, thanks a bunch.

Pull-Request has been merged by robyduck

2 years ago