From f3a7f255529f8fdf2abfa06d3cbd37aff8941bdd Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: May 01 2018 08:39:22 +0000 Subject: Update Fedora Atomic page for F28 release * 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 cur_id on atomic page * Replace reference of Docker with Container on atomic page Signed-off-by: Sinny Kumari --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index f39d2bf..094eed7 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -17,17 +17,17 @@ release={ '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', diff --git a/getfedora.org/build/atomic_vars.py b/getfedora.org/build/atomic_vars.py index 4cdf0cc..3912455 100755 --- a/getfedora.org/build/atomic_vars.py +++ b/getfedora.org/build/atomic_vars.py @@ -179,7 +179,6 @@ def collect(curr_atomic_id, next_atomic_id): 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 @@ def collect(curr_atomic_id, next_atomic_id): # 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 diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index 24b2d34..f8ac7ad 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -50,7 +50,7 @@ def collect(release): # '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', }), diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html index 37dc74d..d3bcf9b 100644 --- a/getfedora.org/data/content/atomic/download/index.html +++ b/getfedora.org/data/content/atomic/download/index.html @@ -289,13 +289,13 @@
${_('qcow2 Image')}
-

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

+

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

${_('Download')}

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

${_('Raw Image')}
-

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

+

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

${_('Download')}

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

@@ -304,11 +304,11 @@
diff --git a/getfedora.org/static/js/checksum.js b/getfedora.org/static/js/checksum.js index 06094b0..4aa50d9 100644 --- a/getfedora.org/static/js/checksum.js +++ b/getfedora.org/static/js/checksum.js @@ -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-Workstation-netinst-i386-' + curr_id + '-' + RC_gold + '.iso'] 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 @@ window.onload = function(){ for (var i = 0; i