From e39d2d8f34c594232d1b495b41d5d2f9d11173c3 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Sep 27 2021 04:59:25 +0000
Subject: Bump for f35 beta


Signed-off-by: Rick Elrod <rick@elrod.me>

---

diff --git a/alt.fedoraproject.org/data/content/index.html b/alt.fedoraproject.org/data/content/index.html
index a9b02c9..3ab15ec 100644
--- a/alt.fedoraproject.org/data/content/index.html
+++ b/alt.fedoraproject.org/data/content/index.html
@@ -89,36 +89,6 @@
             <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/security/">${_('Verify')}</a></p>
             </div>
           </div>
-<!--
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/workstation.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Workstation')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_workstation_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/workstation.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Workstation')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('32 bit %sMB ISO')) % global_variables.iso_size['i386_workstation_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_id']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-            </div>
-          </div>
-	  -->
         </div>
 	<div class="col-md-12">
 	  <p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
@@ -150,26 +120,6 @@
           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/security/">${_('Verify')}</a></p>
           </div>
         </div>
-<!--
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Workstation')}</h3>
-          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Workstation')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_id']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-          </div>
-        </div>
--->
       </div>
       <div class="col-xs-12">
 	<p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
@@ -202,30 +152,6 @@
           <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/security/">${_('Verify')}</a></p>
           </div>
         </div>
-<!--
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Workstation')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Workstation')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_id']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="/verify">${_('Verify')}</a></p>
-          </div>
-        </div>
--->
       </div>
       <div class="col-sm-12">
 	<p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index fc450cb..9b5f0b9 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -73,6 +73,9 @@
             </div>
           </div>
         </div>
+        <div class="col-md-12">
+	  <p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
+        </div>
       </div>
     </div>
   </div>
@@ -100,24 +103,9 @@
           <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Server-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
           </div>
         </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Workstation')}</h3>
-          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Workstation-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Workstation')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Workstation-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-i386-CHECKSUM">${_('Verify')}</a></p>
-          </div>
-        </div>
+      </div>
+      <div class="col-xs-12">
+	<p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
       </div>
     </div>
   </div>
@@ -147,28 +135,9 @@
           <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Server-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
           </div>
         </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Workstation')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Workstation-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/workstation.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Workstation')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/static/checksums/Fedora-Workstation-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-i386-CHECKSUM">${_('Verify')}</a></p>
-          </div>
-        </div>
+      </div>
+      <div class="col-sm-12">
+	<p><em>${_('Note: You can select different editions of Fedora to install with this netinstall. You are not limited to Server edition only.')}</em></p>
       </div>
     </div>
   </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 3827f21..83512ab 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -7,12 +7,12 @@ release={
     'next_id':     '35',
     'curr_name':   '',
     'next_name':   '',
-    '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_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' or '' - No Alpha/Beta for Atomic Host
     'prev_arm_id': '33',
     'prev_alt_id': '33',
@@ -61,12 +61,12 @@ release={
     '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_pre_gold': '1.3',         # insert the number of the prerelease RC version declared GOLD
-    'RC_pre_build': '1.3',        # sometimes releng use the RC build
-    'RC_pre_gold_aarch64': '1.3', # Pre RC Gold for aarch64
-    'RC_pre_gold_ppc64': '1.3',   # Pre RC Gold for ppc64
-    'RC_pre_gold_ppc64le': '1.3', # Pre RC Gold for ppc64le
-    'RC_pre_gold_s390x': '1.3',   # Pre RC Gold for s390x
+    'RC_pre_gold': '1.2',         # insert the number of the prerelease RC version declared GOLD
+    'RC_pre_build': '1.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',