fedora-websites

Clone
Source Code
GIT

#813 Update Fedora Atomic page for F28 release
Merged 5 years ago by robyduck. Opened 5 years ago by sinnykumari.
sinnykumari/fedora-websites f28  into  f28

file modified
+3 -3 
@@ -17,17 +17,17 @@ 
 

      'prev_arm_id': '27',
 

      'prev_alt_id': '27',
 

      'prev_cloud_id': '27',
 

-     'prev_atomic_id': '26',
 

+     'prev_atomic_id': '27',
 

      'curr_arm_id': '28',
 

      'curr_alt_id': '28',
 

      'curr_cloud_id': '28',
 

-     'curr_atomic_id': '27',
 

+     'curr_atomic_id': '28',
 

      'curr_server_id': '28',
 

      'curr_cloud_AMI_id': '28',
 

      'next_arm_id': '29',
 

      'next_alt_id': '29',
 

      'next_cloud_id': '29',
 

-     'next_atomic_id': '28',
 

+     'next_atomic_id': '29',
 

      'next_server_id': '29',
 

      'next_cloud_AMI_id': '29',
 

      'composedate': '20160616',

file modified
+5 -6 
@@ -179,7 +179,6 @@ 
 

                  continue
 

  

              length = int(response.headers['content-length']) / 1000000
 

- 

              # Provide the download URL
 

              url_key = mapping[key] + "_url"
 

              results['release'][url_key] = download_url
 
@@ -196,16 +195,16 @@ 
 

  

      # Special case for Atomic ISO latest redirect rule mapping because it's
 

      # not included in fedmsg data
 

-     atomic_iso_filename = "Fedora-Atomic-ostree-x86_64-{}-{}.iso".format(
 

-         globalvar.release['curr_id'],
 

+     atomic_iso_filename = "Fedora-AtomicHost-ostree-x86_64-{}-{}.iso".format(
 

+         globalvar.release['curr_atomic_id'],
 

          results['release'][composedate_prefix + 'atomic_composedate']
 

      )
 

      results['release']['redir_map']['atomic_iso'] = {}
 

      results['release']['redir_map']['atomic_iso']['redirect'] = \
 

-         globalvar.path['download_atomic'] + "/stable/Fedora-Atomic-" + \
 

-         globalvar.release['curr_id'] + '-' + \
 

+         globalvar.path['download_atomic'] + "/stable/Fedora-AtomicHost-" + \
 

+         globalvar.release['curr_atomic_id'] + '-' + \
 

          results['release'][composedate_prefix + 'atomic_composedate'] + \
 

-         "/Atomic/x86_64/iso/{}".format(atomic_iso_filename)
 

+         "/AtomicHost/x86_64/iso/{}".format(atomic_iso_filename)
 

      results['release']['redir_map']['atomic_iso']['filename'] = atomic_iso_filename
 

  

      return results

file modified
+1 -1 
@@ -50,7 +50,7 @@ 
 

          #    '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-Atomic-{curr_atomic_id}-{atomic_composedate}.x86_64", {
 

+         ("Fedora-AtomicHost-{curr_atomic_id}-{atomic_composedate}.x86_64", {
 

             'HVM_atomic_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',
 

             'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',
 

          }),

file modified
+5 -5 
@@ -289,13 +289,13 @@ 
 

  		      <div class="row visible-xs">
 

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

  		            <h5 class="bold">${_('qcow2 Image')}</h5>
 

- 		            <p>${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_id']}}</p>
 

+ 		            <p>${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_atomic_id']}}</p>
 

  		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
 

  		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['atomic_qcow2_cloud']}</p>
 

  		          </div>
 

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

  		            <h5 class="bold">${_('Raw Image')}</h5>
 

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

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

  		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
 

  		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['atomic_raw_cloud']}</p>
 

  		          </div>
 
@@ -304,11 +304,11 @@ 
 

  		      <div class="row hidden-xs">
 

  		          <div class="col-sm-6">
 

  		            <h5 class="bold">${_('qcow2 Image')}</h5>
 

- 		            <p>${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_id']}}</p>
 

+ 		            <p>${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_atomic_id']}}</p>
 

  		          </div>
 

  		          <div class="col-sm-6">
 

  		            <h5 class="bold">${_('Raw Image')}</h5>
 

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

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

  		          </div>
 

  		      </div>
 

  		      <div class="row hidden-xs">
 
@@ -330,7 +330,7 @@ 
 

      <div class="col-md-3 col-xs-12 col-md-offset-1 top-margin">
 

          <h3>${_('Other Downloads')}</h3>
 

            <ul>
 

-             <li><p><a class="download-cloud-splash" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/Atomic/x86_64/iso/Fedora-Atomic-ostree-x86_64-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}.iso">${_('Atomic Host ISO image (%sMB)') % global_variables.iso_size['atomic_iso']}</a></p></li>
 

+             <li><p><a class="download-cloud-splash" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/AtomicHost/x86_64/iso/Fedora-AtomicHost-ostree-x86_64-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}.iso">${_('Atomic Host ISO image (%sMB)') % global_variables.iso_size['atomic_iso']}</a></p></li>
 

              <li><p><a class="download-cloud-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Container/x86_64/images/Fedora-Container-Base-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.x86_64.tar.xz">${_('Container Image (%sMB)') % global_variables.iso_size['x86_64_Container']}</a></p></li>
 

              <li><p><a href="https://cloud.fedoraproject.org/">Fedora Cloud Base images</a></p></li>
 

            </ul>

file modified
+3 -3 
@@ -62,13 +62,13 @@ 
 

              </div>
 

              <h4 class="uppercase">${_('Atomic')}</h4>
 

              <div class="h-body text-center">
 

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/Atomic/x86_64/iso/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}-x86_64-CHECKSUM">${_('For Atomic Host Iso')}</a>
 

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/AtomicHost/x86_64/iso/Fedora-AtomicHost-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}-x86_64-CHECKSUM">${_('For Atomic Host Iso')}</a>
 

              </div>
 

              <div class="h-body text-center">
 

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/CloudImages/x86_64/images/Fedora-CloudImages-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}-x86_64-CHECKSUM">${_('For Atomic Host images')}</a>
 

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/AtomicHost/x86_64/images/Fedora-AtomicHost-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}-x86_64-CHECKSUM">${_('For Atomic Host images')}</a>
 

              </div>
 

              <div class="h-body text-center">
 

-               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="./static/checksums/Fedora-Docker-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('For Docker')}</a>
 

+               <a class="btn btn-default btn-topmargin btn-verify btn-checksum" href="./static/checksums/Fedora-Container-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}-x86_64-CHECKSUM">${_('For Container')}</a>
 

              </div>
 

          </div>
 

      </div>

file modified
+9 -8 
@@ -1,7 +1,7 @@ 
 

  var dir_path = '../../static/checksums/';
 

- var atom_path = 'https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0/CloudImages/x86_64/images/';
 

  var dock_path = 'https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0/Container/x86_64/images/';
 

- var iso_path = 'https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0/Atomic/x86_64/iso/';
 

+ var atom_path = 'https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0/AtomicHost/x86_64/images/';
 

+ var iso_path = 'https://dl.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0/AtomicHost/x86_64/iso/';
 

  

  var checksums = [];
 

  // Generate dynamic checksum paths
 
@@ -12,13 +12,14 @@ 
 

  checksums['Fedora-Server-dvd-x86_64-' + curr_server_id + '-' + RC_server_gold + '.iso'] = dir_path + 'Fedora-Server-' + curr_server_id + '-' + RC_server_gold + '-x86_64-CHECKSUM';
 

  checksums['Fedora-Server-netinst-x86_64-' + curr_server_id + '-' + RC_server_gold + '.iso'] = dir_path + 'Fedora-Server-' + curr_server_id + '-' + RC_server_gold + '-x86_64-CHECKSUM';
 

  checksums['Fedora-Container-Base-' + curr_id + '-' + RC_gold + '.x86_64.tar.xz'] = dir_path + 'Fedora-Container-' + curr_id + '-' + RC_gold + '-x86_64-CHECKSUM';
 

- checksums['Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.qcow2'] = atom_path + 'Fedora-CloudImages-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

- checksums['Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.raw.xz'] = atom_path + 'Fedora-CloudImages-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

- checksums['Fedora-Atomic-Vagrant-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.vagrant-libvirt.box'] = atom_path + 'Fedora-CloudImages-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

- checksums['Fedora-Atomic-Vagrant-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.vagrant-virtualbox.box'] = atom_path + 'Fedora-CloudImages-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

- checksums['Fedora-Atomic-ostree-x86_64-' + curr_atomic_id + '-' + atomic_composedate + '.0.iso'] = iso_path + 'Fedora-Atomic-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

+ checksums['Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.qcow2'] = atom_path + 'Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

+ checksums['Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.raw.xz'] = atom_path + 'Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

+ checksums['Fedora-AtomicHost-Vagrant-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.vagrant-libvirt.box'] = atom_path + 'Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

+ checksums['Fedora-AtomicHost-Vagrant-' + curr_atomic_id + '-' + atomic_composedate + '.0.x86_64.vagrant-virtualbox.box'] = atom_path + 'Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

+ checksums['Fedora-AtomicHost-ostree-x86_64-' + curr_atomic_id + '-' + atomic_composedate + '.0.iso'] = iso_path + 'Fedora-AtomicHost-' + curr_atomic_id + '-' + atomic_composedate + '.0-x86_64-CHECKSUM';
 

  checksums['Fedora-AtomicWorkstation-ostree-x86_64-' + curr_id + '-' + RC_gold + '.iso'] = dir_path + 'Fedora-AtomicWorkstation-' + curr_id + '-' + RC_gold + '-x86_64-CHECKSUM';
 

  

+ 

  var fallback = '../../verify.html';
 

  

  window.onload = function(){
 
@@ -28,4 +29,4 @@ 
 

    for (var i = 0; i<links.length; i++) {
 

        links[i].href = (checksum === undefined) ? fallback : checksum;
 

    }
 

- } 

\ No newline at end of file
 

+ }

  • Update curr_atomic_id and next_atomic_id
  • Update Atomic iso name and link with new format
  • Update checksum links for Atomic artifacts
    to follow new directory structure, Now, both
    Atomic iso and Atomic cloud images are produced
    under AtomicHost directory.
  • Use curr_atomic_id instead of curr_id on atomic page
  • Replace reference of Docker with Container on
    atomic page

Signed-off-by: Sinny Kumari sinny@redhat.com

Note: No changes required to update Atomic Cloud Image urls. They look good since it fetches information from datagrepper from topic "org.fedoraproject.prod.releng.atomic.twoweek.complete"

Please only review this PR and don't yet merge it until we do F28 based Two Week release.
Atomic Team will update here once this is ready to get merged.

LGTM - will let others review and we will merge on release day

+1 from me.
I would like @robyduck opinion as he's more familiar with things.

+1
Thank you very much.

rebased onto a6cf12f12180f00378a77e9596322fe7b389cfa8
5 years ago

rebased onto da3a0e86ce96417f6c4891c557a930bab8119ccd
5 years ago

Sorry, can you review it? I needed to update Docker paths already with Container, as this affects not only Atomic but also other arches.

rebased onto 47e951fc9d8693d4765d9daba146a25e5140ff4f
5 years ago

Sorry, can you review it? I needed to update Docker paths already with Container, as this affects not only Atomic but also other arches.

Rebased with latest available changes in F28 branch. Should be good now.

rebased onto 40942d6f6e60773d8e66a5c55b7468883a5c0ed7
5 years ago

rebased onto ea40d3a7f644e2f68fdb9ca1e54238ff35525754
5 years ago

Rebased with minor fixes like updating templates variable value fix.

Ready to get merged now.

rebased onto f3a7f25
5 years ago

Pull-Request has been merged by robyduck
5 years ago
Metadata
None
No Tags
Changes Summary 6
+3 -3
file changed
build.d/globalvar.py
+5 -6
file changed
getfedora.org/build/atomic_vars.py
+1 -1
file changed
getfedora.org/build/fedimg_vars.py
+5 -5
file changed
getfedora.org/data/content/atomic/download/index.html
+3 -3
file changed
getfedora.org/data/content/verify.html
+9 -8
file changed
getfedora.org/static/js/checksum.js
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.