#1148 Update for F36 release
Merged 3 months ago by bcotton. Opened 3 months ago by bcotton.

@@ -105,9 +105,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

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

              <ul>

+                 <li><code>38AB71F4</code> - ${_('Fedora 36')}</li>

                  <li><code>9867C58F</code> - ${_('Fedora 35')}</li>

                  <li><code>45719A39</code> - ${_('Fedora 34')}</li>

-                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

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

@@ -68,9 +68,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

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

              <ul>

+                 <li><code>38AB71F4</code> - ${_('Fedora 36')}</li>

                  <li><code>9867C58F</code> - ${_('Fedora 35')}</li>

                  <li><code>45719A39</code> - ${_('Fedora 34')}</li>

-                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

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

file modified
+33 -33
@@ -2,42 +2,42 @@ 

  # -*- 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',

      # 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',
@@ -54,13 +54,13 @@ 

      # 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

@@ -47,9 +47,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

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

              <ul>

+                 <li><code>38AB71F4</code> - ${_('Fedora 36')}</li>

                  <li><code>9867C58F</code> - ${_('Fedora 35')}</li>

                  <li><code>45719A39</code> - ${_('Fedora 34')}</li>

-                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

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

@@ -46,9 +46,9 @@ 

              <pre class="command">$ gpg --verify-files *-CHECKSUM</pre>

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

              <ul>

+                 <li><code>38AB71F4</code> - ${_('Fedora 36')}</li>

                  <li><code>9867C58F</code> - ${_('Fedora 35')}</li>

                  <li><code>45719A39</code> - ${_('Fedora 34')}</li>

-                 <li><code>9570FF31</code> - ${_('Fedora 33')}</li>

                  <li><code>DBBDCF7C</code> - ${_('IOT 2019')}</li>

              </ul>

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

no initial comment

I was going to push that too, but you beat me to it :)

1 new commit added

  • add F36 GPG key
3 months ago

1 new commit added

  • use latest FMW version
3 months ago

Pull-Request has been merged by bcotton

3 months ago