From 4089a1aa6f6684c99e1001c3744a8e27ad41133c Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: May 09 2022 17:58:33 +0000 Subject: [PATCH 1/3] Update for F36 release --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index a20f319..364c63f 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -2,37 +2,37 @@ # -*- coding: utf-8 -*- # This file defines all variable needed to be edited during the release cycle (alpha, beta...). release={ - 'prev_id': '34', - 'curr_id': '35', - 'next_id': '36', + 'prev_id': '35', + 'curr_id': '36', + 'next_id': '37', '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_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': '34', - 'prev_alt_id': '34', - 'prev_cloud_id': '34', + 'prev_arm_id': '35', + 'prev_alt_id': '35', + 'prev_cloud_id': '35', 'prev_atomic_id': '30', - 'curr_arm_id': '35', - 'curr_alt_id': '35', - 'curr_cloud_id': '35', + 'curr_arm_id': '36', + 'curr_alt_id': '36', + 'curr_cloud_id': '36', 'curr_atomic_id': '30', - 'curr_server_id': '35', - 'curr_cloud_AMI_id': '35', - 'curr_iot_id': '35', - 'curr_silverblue_id': '35', - 'next_silverblue_id': '36', - 'next_arm_id': '36', - 'next_alt_id': '36', - 'next_cloud_id': '36', + 'curr_server_id': '36', + 'curr_cloud_AMI_id': '36', + 'curr_iot_id': '36', + 'curr_silverblue_id': '36', + 'next_silverblue_id': '37', + 'next_arm_id': '37', + 'next_alt_id': '37', + 'next_cloud_id': '37', 'next_atomic_id': '30', - 'next_server_id': '36', - 'next_cloud_AMI_id': '36', + 'next_server_id': '37', + 'next_cloud_AMI_id': '37', 'composedate': '20160616', 'unofficial_compose': '20181029', 'alt_composedate': '20161118', @@ -54,13 +54,13 @@ 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.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_ppc64le': '1.2', # RC Gold for ppc64le - 'RC_gold_s390x': '1.2', # RC Gold for s390x + 'RC_gold': '1.5', # insert the number of the RC version declared GOLD + 'RC_server_gold': '1.5', # insert the number of the RC version declared GOLD + 'RC_build': '1.5', # sometimes releng use the RC build + 'RC_gold_aarch64': '1.5', # RC Gold for aarch64 + 'RC_gold_ppc64': '1.5', # RC Gold for ppc64 + 'RC_gold_ppc64le': '1.5', # RC Gold for ppc64le + 'RC_gold_s390x': '1.5', # RC Gold for s390x 'RC_pre_gold': '1.4', # insert the number of the prerelease RC version declared GOLD 'RC_pre_build': '1.4', # sometimes releng use the RC build 'RC_pre_gold_aarch64': '1.4', # Pre RC Gold for aarch64 From 0fdf54774da8f916bc38a0fdd36664021c6efc62 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: May 09 2022 18:22:23 +0000 Subject: [PATCH 2/3] add F36 GPG key --- diff --git a/alt.fedoraproject.org/data/content/verify.html b/alt.fedoraproject.org/data/content/verify.html index 99b1ea1..8af2852 100644 --- a/alt.fedoraproject.org/data/content/verify.html +++ b/alt.fedoraproject.org/data/content/verify.html @@ -105,9 +105,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

diff --git a/arm.fedoraproject.org/data/content/verify.html b/arm.fedoraproject.org/data/content/verify.html index cd70148..c9e0164 100644 --- a/arm.fedoraproject.org/data/content/verify.html +++ b/arm.fedoraproject.org/data/content/verify.html @@ -68,9 +68,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

diff --git a/labs.fedoraproject.org/data/content/verify.html b/labs.fedoraproject.org/data/content/verify.html index 9cad147..7778721 100644 --- a/labs.fedoraproject.org/data/content/verify.html +++ b/labs.fedoraproject.org/data/content/verify.html @@ -47,9 +47,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

diff --git a/spins.fedoraproject.org/data/content/verify.html b/spins.fedoraproject.org/data/content/verify.html index d98bab1..98a41db 100644 --- a/spins.fedoraproject.org/data/content/verify.html +++ b/spins.fedoraproject.org/data/content/verify.html @@ -46,9 +46,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

From 945fe8cf377a0f61e92d1f5d7c02037ed0c7df51 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: May 09 2022 18:36:39 +0000 Subject: [PATCH 3/3] use latest FMW version --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 364c63f..7793135 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -37,7 +37,7 @@ release={ 'unofficial_compose': '20181029', 'alt_composedate': '20161118', # Fedora Media Writer - 'fmw': '4.1.4', + 'fmw': 'latest', # These variables are only necessary to keep fedoraproject.org working 'curr_ppc64_id': '29', 'prev_ppc64_id': '28',