From 7f2828a0191906d57b0304a918c8b91eb78cdadd Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Oct 30 2018 01:19:29 +0000 Subject: handle special-cases for f29 GA Signed-off-by: Rick Elrod --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index e69352a..b03c643 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -2,45 +2,45 @@ # -*- coding: utf-8 -*- # This file defines all variable needed to be edited during the release cycle (alpha, beta...). release={ - 'prev_id': '27', - 'curr_id': '28', - 'next_id': '29', + 'prev_id': '28', + 'curr_id': '29', + 'next_id': '30', 'curr_name': '', 'next_name': '', - 'curr_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_arm_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_alt_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_AMI_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_server_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_atomic_state': 'Pre-Release', # No Alpha/Beta for Atomic Host - 'prev_arm_id': '27', - 'prev_alt_id': '27', - 'prev_cloud_id': '27', - 'prev_atomic_id': '27', - 'curr_arm_id': '28', - 'curr_alt_id': '28', - 'curr_cloud_id': '28', - 'curr_atomic_id': '28', - 'curr_server_id': '28', - 'curr_cloud_AMI_id': '28', + 'curr_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_arm_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_alt_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_AMI_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_server_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_atomic_state': '', # 'Pre-Release' or '' - No Alpha/Beta for Atomic Host + 'prev_arm_id': '28', + 'prev_alt_id': '28', + 'prev_cloud_id': '28', + 'prev_atomic_id': '28', + 'curr_arm_id': '29', + 'curr_alt_id': '29', + 'curr_cloud_id': '29', + 'curr_atomic_id': '29', + 'curr_server_id': '29', + 'curr_cloud_AMI_id': '29', 'curr_iot_id': '29', 'curr_silverblue_id': '29', - 'next_arm_id': '29', - 'next_alt_id': '29', - 'next_cloud_id': '29', - 'next_atomic_id': '29', - 'next_server_id': '29', - 'next_cloud_AMI_id': '29', + 'next_arm_id': '30', + 'next_alt_id': '30', + 'next_cloud_id': '30', + 'next_atomic_id': '30', + 'next_server_id': '30', + 'next_cloud_AMI_id': '30', 'composedate': '20160616', - 'unofficial_compose': '20160614', + 'unofficial_compose': '20181029', 'alt_composedate': '20161118', # Fedora Media Writer 'fmw': '4.1.1', # These variables are only necessary to keep fedoraproject.org working - 'curr_ppc64_id': '28', - 'prev_ppc64_id': '27', - 'curr_s390_id': '28', + 'curr_ppc64_id': '29', + 'prev_ppc64_id': '28', + 'curr_s390_id': '29', # Note that atomic values here get overwritten by the twoweek script. 'atomic_composedate': '20160616', 'pre_cloud_composedate': '20150915', @@ -53,18 +53,18 @@ release={ # Note that atomic values here get overwritten by the twoweek script. 'pre_cloud_atomic_composedate': '20150915', 'pre_cloud_AMI_atomic_composedate': '20150915', - 'RC_gold': '1.1', # insert the number of the RC version declared GOLD - 'RC_server_gold': '1.1', # insert the number of the RC version declared GOLD - 'RC_build': '1.1', # sometimes releng use the RC build - 'RC_gold_aarch64': '1.1', # RC Gold for aarch64 - 'RC_gold_ppc64': '1.1', # RC Gold for ppc64 - 'RC_gold_s390x': '1.1', # RC Gold for s390x - 'RC_pre_gold': '1.5', # insert the number of the prerelease RC version declared GOLD - 'RC_pre_build': '5', # sometimes releng use the RC build - 'RC_pre_gold_aarch64': '1.5', # Pre RC Gold for aarch64 - 'RC_pre_gold_ppc64': '1.5', # Pre RC Gold for ppc64 - 'RC_pre_gold_ppc64le': '1.5', # Pre RC Gold for ppc64le - 'RC_pre_gold_s390x': '1.5', # Pre RC Gold for s390x + 'RC_gold': '1.2', # insert the number of the RC version declared GOLD + 'RC_server_gold': '1.2', # insert the number of the RC version declared GOLD + 'RC_build': '1.2', # sometimes releng use the RC build + 'RC_gold_aarch64': '1.2', # RC Gold for aarch64 + 'RC_gold_ppc64': '1.2', # RC Gold for ppc64 + 'RC_gold_s390x': '1.2', # RC Gold for s390x + 'RC_pre_gold': '1.2', # insert the number of the prerelease RC version declared GOLD + 'RC_pre_build': '2', # sometimes releng use the RC build + 'RC_pre_gold_aarch64': '1.2', # Pre RC Gold for aarch64 + 'RC_pre_gold_ppc64': '1.2', # Pre RC Gold for ppc64 + 'RC_pre_gold_ppc64le': '1.2', # Pre RC Gold for ppc64le + 'RC_pre_gold_s390x': '1.2', # Pre RC Gold for s390x 'atomic_qcow2_cloud_url': 'FIXME', 'atomic_raw_cloud_url': 'FIXME', @@ -150,10 +150,10 @@ iso_size={ 'x86_64_Live_KDE': '1.8', # In GB 'i686_Live_LXDE': '1.1', # In GB 'x86_64_Live_LXDE': '1.2', # In GB - 'i686_Live_LXQt': '1.2', # In GB - 'x86_64_Live_LXQt': '1.2', # In GB - 'i686_Live_Xfce': '1.2', # In GB - 'x86_64_Live_Xfce': '1.3', # In GB + 'i686_Live_LXQt': '1.4', # In GB + 'x86_64_Live_LXQt': '1.4', # In GB + 'i686_Live_Xfce': '1.4', # In GB + 'x86_64_Live_Xfce': '1.4', # In GB 'i686_Live_Mate': '1.8', # In GB 'x86_64_Live_Mate': '1.8', # In GB 'i686_Live_Soas': '863', # In MB @@ -182,8 +182,8 @@ iso_size={ 'x86_64_Live_Games': '4.2', # In GB 'i686_Live_Elab': '2.5', # In GB 'x86_64_Live_Elab': '2.5', # In GB - 'i686_Live_Design': '2.1', # In GB - 'x86_64_Live_Design': '2.1', # In GB + 'i686_Live_Design': '2.4', # In GB + 'x86_64_Live_Design': '2.4', # In GB 'i686_Live_Sci-kde': '3.4', # In GB 'x86_64_Live_Sci-kde': '3.5', # In GB 'i686_Live_Robotics': '2.5', # In GB diff --git a/labs.fedoraproject.org/data/content/astronomy/download/index.html b/labs.fedoraproject.org/data/content/astronomy/download/index.html index 0ad904e..f738a19 100644 --- a/labs.fedoraproject.org/data/content/astronomy/download/index.html +++ b/labs.fedoraproject.org/data/content/astronomy/download/index.html @@ -17,13 +17,17 @@

${Markup(_('Download Fedora %(rel)s Astronomy')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+ +

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Astronomy']}
+ + +

${_('What is a Live image?')}

@@ -35,7 +39,8 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html index 5738546..daab047 100644 --- a/labs.fedoraproject.org/data/content/design-suite/download/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html @@ -18,8 +18,8 @@

${Markup(_('Download Fedora %(rel)s Design Suite')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

- + +

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Design']}
@@ -27,7 +27,7 @@
- +
@@ -40,8 +40,8 @@

${_('Direct Downloads')}

${_('Older Releases')}

diff --git a/labs.fedoraproject.org/data/templates/generic/unofficial.html b/labs.fedoraproject.org/data/templates/generic/unofficial.html index 70f8fb9..8a1ce97 100644 --- a/labs.fedoraproject.org/data/templates/generic/unofficial.html +++ b/labs.fedoraproject.org/data/templates/generic/unofficial.html @@ -8,11 +8,11 @@
-

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} +

${Markup(_('Although this spin failed to compose for the final release, this test compose contains fixes over the final content to allow for a successful compose and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.1-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.1-i386-CHECKSUM'})}

- \ No newline at end of file + diff --git a/labs.fedoraproject.org/static/js/init.js b/labs.fedoraproject.org/static/js/init.js index 8d49477..bbfefa7 100644 --- a/labs.fedoraproject.org/static/js/init.js +++ b/labs.fedoraproject.org/static/js/init.js @@ -116,6 +116,7 @@ $(document).ready(function(){ var valid = false; var allowed_prefixes = [ 'https://download.fedoraproject.org/', + 'https://dl.fedoraproject.org/', 'http://torrent.fedoraproject.org/', 'http://mirrors.fedoraproject.org/' ]; diff --git a/spins.fedoraproject.org/data/content/lxqt/download/index.html b/spins.fedoraproject.org/data/content/lxqt/download/index.html index 7fa0d35..f8da70e 100755 --- a/spins.fedoraproject.org/data/content/lxqt/download/index.html +++ b/spins.fedoraproject.org/data/content/lxqt/download/index.html @@ -17,13 +17,17 @@

${Markup(_('Download Fedora %(rel)s LXQt Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+ +

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_LXQt']}
+ + +

${_('What is a Live image?')}

@@ -35,7 +39,8 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/content/xfce/download/index.html b/spins.fedoraproject.org/data/content/xfce/download/index.html index f56ccad..1a497c1 100644 --- a/spins.fedoraproject.org/data/content/xfce/download/index.html +++ b/spins.fedoraproject.org/data/content/xfce/download/index.html @@ -17,13 +17,17 @@

${Markup(_('Download Fedora %(rel)s Xfce Desktop')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+ +

${_('Download')}

${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Xfce']}
+ + +

${_('What is a Live image?')}

@@ -35,7 +39,8 @@

${_('Direct Downloads')}

${Markup(_('ARM<span class="sup">®</span> Technology'))}

diff --git a/spins.fedoraproject.org/data/templates/generic/unofficial.html b/spins.fedoraproject.org/data/templates/generic/unofficial.html index 70f8fb9..8a1ce97 100644 --- a/spins.fedoraproject.org/data/templates/generic/unofficial.html +++ b/spins.fedoraproject.org/data/templates/generic/unofficial.html @@ -8,11 +8,11 @@
-

${Markup(_('Although this spin failed to compose for the final release, the nightly test compose contains the same package set, and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.n.0-i386-CHECKSUM'})} +

${Markup(_('Although this spin failed to compose for the final release, this test compose contains fixes over the final content to allow for a successful compose and should meet most users\' needs. You can verify the test compose image with a dedicated CHECKSUM file for <a href="%(x86_64)s">64-bit</a> and <a href="%(i386)s">32-bit</a> images.') % {'x86_64':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/x86_64/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.1-x86_64-CHECKSUM', 'i386':global_variables.path['unofficial'] + '/' + global_variables.release['curr_id'] + '/i386/Fedora-UNOFFICIAL-' + global_variables.release['curr_id'] + '-' + global_variables.release['unofficial_compose'] + '.1-i386-CHECKSUM'})}

- \ No newline at end of file + diff --git a/spins.fedoraproject.org/static/js/init.js b/spins.fedoraproject.org/static/js/init.js index b1fff5f..282e542 100644 --- a/spins.fedoraproject.org/static/js/init.js +++ b/spins.fedoraproject.org/static/js/init.js @@ -117,6 +117,7 @@ $(document).ready(function(){ var valid = false; var allowed_prefixes = [ 'https://download.fedoraproject.org/', + 'https://dl.fedoraproject.org/', 'http://torrent.fedoraproject.org/', 'http://mirrors.fedoraproject.org/' ];