Diff from f28 to master - fedora-websites

build.d/globalvar.py

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

getfedora.org/build/atomic_vars.py

file modified

+4 -22

		`@@ -145,7 +145,7 @@`
		`continue`

		`# Parse the composedate out of the image_name`
		`- image_name = message['msg']['atomic_qcow2']['image_name']`
		`+ image_name = message['msg']['x86_64']['atomic_qcow2']['image_name']`
		`composedate = '.'.join(image_name.split('-')[-1].split('.')[:-2])`
		`log.info(" Found composedate: %s" % composedate)`
		`results['release'][composedate_prefix + 'atomic_composedate'] = composedate`
		`@@ -161,8 +161,9 @@`
		`'atomic_raw': 'atomic_raw_cloud',`
		`'atomic_vagrant_libvirt': 'atomic_libvag_cloud',`
		`'atomic_vagrant_virtualbox': 'atomic_VBvag_cloud',`
		`+ 'atomic_dvd_ostree': 'atomic_dvd_iso',`
		`}`
		`- for key, entry in message['msg'].items():`
		`+ for key, entry in message['msg']['x86_64'].items():`
		`# There are some other keys in there we don't care about.`
		`if not key.startswith('atomic_'):`
		`continue`
		`@@ -173,13 +174,8 @@`
		`if not url.startswith('http'):`
		`url = DL_URL_PREFIX + url`
		`download_url = download_fpo + entry['image_url']`
		`- response = requests.head(url)`
		`- if not bool(response):`
		`- log.error("Failed to HEAD %s for size. %r" % (url, response))`
		`- continue`
		`-`
		`- length = int(response.headers['content-length']) / 1000000`

		`+ length = int(entry['size']) / (1024 * 1024)`
		`# Provide the download URL`
		`url_key = mapping[key] + "_url"`
		`results['release'][url_key] = download_url`
		`@@ -194,20 +190,6 @@`
		`iso_size_key = iso_size_prefix + mapping[key]`
		`results['iso_size'][iso_size_key] = str(length)`

		`- # 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'],`
		`- 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'] + '-' + \`
		`- results['release'][composedate_prefix + 'atomic_composedate'] + \`
		`- "/Atomic/x86_64/iso/{}".format(atomic_iso_filename)`
		`- results['release']['redir_map']['atomic_iso']['filename'] = atomic_iso_filename`
		`-`
		`return results`

getfedora.org/build/fedimg_vars.py

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',`
		`}),`

getfedora.org/data/content/atomic/download/index.html

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

getfedora.org/data/content/verify.html

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

getfedora.org/static/js/checksum.js

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`
		`+ }`

fedora-websites

Source Code

Diff 2 commits, 6 files changed +25 -42

Diff

2 commits, 6 files changed

+25 -42