From b1bd6db8857e32bb8ef955863c7eff0f631a8e54 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Apr 03 2017 21:41:24 +0000
Subject: update image sizes for F26 Alpha


---

diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html
index ee67ade..5ba8542 100644
--- a/arm.fedoraproject.org/data/content/prerelease.html
+++ b/arm.fedoraproject.org/data/content/prerelease.html
@@ -46,7 +46,7 @@
             <h3>${_('Fedora Server')}</h3>
             </div>
             <div class="col-sm-3 hidden-xs">
-            <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Server']}</p>
+            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Server']}</p>
             </div>
             <div class="col-sm-5 hidden-xs">
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/armhfp/images/Fedora-Server-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Server-${global_variables.release['next_arm_id']}-${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-armhfp-CHECKSUM">${_('Verify')}</a></p>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 2fd4430..51a5d96 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -150,17 +150,17 @@ iso_size={
     'pre_i686_Live_KDE':    '1.4',       # In GB
     'pre_x86_64_Live_KDE':  '1.3',       # In GB
     'pre_i686_Live_LXDE':   '1.0',       # In GB
-    'pre_x86_64_Live_LXDE': '910',       # In MB
+    'pre_x86_64_Live_LXDE': '909',       # In MB
     'pre_i686_Live_Xfce':   '1.1',       # In GB
-    'pre_x86_64_Live_Xfce': '1.0',       # In GB
+    'pre_x86_64_Live_Xfce': '1.1',       # In GB
     'pre_i686_Live_Mate':   '1.4',       # In GB
     'pre_x86_64_Live_Mate': '1.4',       # In GB
-    'pre_i686_Live_Soas':   '763',       # In MB
-    'pre_x86_64_Live_Soas': '684',       # In MB
+    'pre_i686_Live_Soas':   '822',       # In MB
+    'pre_x86_64_Live_Soas': '734',       # In MB
     'pre_i686_Live_Cinnamon': '1.4',     # In GB
     'pre_x86_64_Live_Cinnamon': '1.3',   # In GB
-    'pre_i686_Live_LXQt':       'nd',    # ND
-    'pre_x86_64_Live_LXQt':     'nd',    # ND
+    'pre_i686_Live_LXQt':    '1.0',      # In GB
+    'pre_x86_64_Live_LXQt':  '927',      # In MB
     # Labs
     'i686_Live_Security':  '1.2',       # In GB
     'x86_64_Live_Security':'1.1',       # In GB
@@ -179,10 +179,10 @@ iso_size={
     'i686_Live_Astronomy': '2.5',       # In GB
     'x86_64_Live_Astronomy':'2.4',      # In GB
     # Labs prerelease
-    'pre_i686_Live_Security':  '1.1',   # In GB
+    'pre_i686_Live_Security':  '1.2',   # In GB
     'pre_x86_64_Live_Security':'1.1',   # In GB
-    'pre_i686_Live_Games':     '3.8',   # In GB
-    'pre_x86_64_Live_Games':   '3.7',   # In GB
+    'pre_i686_Live_Games':     '3.9',   # In GB
+    'pre_x86_64_Live_Games':   '3.8',   # In GB
     'pre_i686_Live_Elab':      '2.5',   # In GB
     'pre_x86_64_Live_Elab':    '2.5',   # In GB
     'pre_i686_Live_Design':    '2.0',   # In GB
@@ -193,20 +193,20 @@ iso_size={
     'pre_x86_64_Live_Robotics':'2.2',   # In GB
     'pre_i686_Live_Jam':       '2.0',   # In GB
     'pre_x86_64_Live_Jam':     '1.9',   # In GB
-    'pre_i686_Live_Astronomy': '2.4',   # In GB
-    'pre_x86_64_Live_Astronomy':'2.3',  # In GB
-    'pre_i686_Live_Python':    '2.4',   # In GB
-    'pre_x86_64_Live_Python':  '2.3',   # In GB
+    'pre_i686_Live_Astronomy': '2.5',   # In GB
+    'pre_x86_64_Live_Astronomy':'2.4',  # In GB
+    'pre_i686_Live_Python':    '1.3',   # In GB
+    'pre_x86_64_Live_Python':  '1.2',   # In GB
     # Server
     'x86_64_server_DVD':   '1.9',       # In GB
     'i386_server_DVD':     '2.0',       # In GB
     'x86_64_server_net':   '484',       # In MB
     'i386_server_net':     '464',       # In MB
     # Server prerelease
-    'pre_x86_64_server_DVD': '1.7',     # In GB
-    'pre_i386_server_DVD':   '2.2',     # In GB
-    'pre_x86_64_server_net': '422',     # In MB
-    'pre_i386_server_net':   '552',     # In MB
+    'pre_x86_64_server_DVD': '2.8',     # In GB
+    'pre_i386_server_DVD':   '2.9',     # In GB
+    'pre_x86_64_server_net': '446',     # In MB
+    'pre_i386_server_net':   '504',     # In MB
     # Workstation
     'x86_64_workstation':  '1.3',       # In GB
     'i386_workstation':    '1.4',       # In GB
@@ -215,8 +215,8 @@ iso_size={
     # Workstation prerelease
     'pre_x86_64_workstation':  '1.3',   # In GB
     'pre_i386_workstation':    '1.4',   # In GB
-    'pre_x86_64_workstation_net': '407',# In MB
-    'pre_i386_workstation_net': '530',  # In MB
+    'pre_x86_64_workstation_net': '449',# In MB
+    'pre_i386_workstation_net': '517',  # In MB
     # ARM
     'ARM_Workstation':     '1.2',       # In GB
     'ARM_Server':          '562',       # In MB
@@ -228,15 +228,15 @@ iso_size={
     'ARM_SoaS':            '743',       # In MB
     # ARM prerelease
     'pre_ARM_Workstation': '1.2',       # In GB
-    'pre_ARM_Server':      '1.7',       # In GB
-    'pre_ARM_Minimal':     '431',       # In MB
+    'pre_ARM_Server':      '594',       # In MB
+    'pre_ARM_Minimal':     '451',       # In MB
     'pre_ARM_KDE':         '1.4',       # In GB
     'pre_ARM_Xfce':        '1.0',       # In GB
     'pre_ARM_LXDE':        '934',       # In MB
     'pre_ARM_LXQt':        '933',       # In MB
     'pre_ARM_Mate':        '1.3',       # In GB
     'pre_ARM_Cinnamon':    '780',       # In MB
-    'pre_ARM_SoaS':        '693',       # In MB
+    'pre_ARM_SoaS':        '771',       # In MB
     # Cloud
     'raw_x86_64_cloud':    '123',       # In MB
     'raw_i386_cloud':      '143',       # In MB
@@ -256,21 +256,21 @@ iso_size={
     'x86_64_docker':       '40',        # In MB
     'atomic_iso':          '918',       # In MB
     # Cloud prerelease
-    'pre_raw_x86_64_cloud':    '226',   # In MB
+    'pre_raw_x86_64_cloud':    '184',   # In MB
     'pre_raw_i386_cloud':      '172',   # In MB
-    'pre_qcow2_x86_64_cloud':  '330',   # In MB
+    'pre_qcow2_x86_64_cloud':  '236',   # In MB
     'pre_qcow2_i386_cloud':    '268',   # In MB
-    'pre_VBvag_cloud':         '208',   # In MB
-    'pre_libvag_cloud':        '199',   # In MB
+    'pre_VBvag_cloud':         '192',   # In MB
+    'pre_libvag_cloud':        '184',   # In MB
     # Note that atomic values here get overwritten by the twoweek script.
     'pre_atomic_raw_cloud':    '???',   # In MB
     'pre_atomic_qcow2_cloud':  '???',   # In MB
     'pre_atomic_VBvag_cloud':  '???',   # In MB
     'pre_atomic_libvag_cloud': '???',   # In MB
     'pre_atomic_iso':          '918',   # In MB
-    'pre_x86_64_docker':        '40',   # In MB
-    'pre_VBvag_cloud':         '237',   # In MB
-    'pre_libvag_cloud':        '227',   # In MB
+    'pre_x86_64_docker':        '42',   # In MB
+    'pre_VBvag_cloud':         '192',   # In MB
+    'pre_libvag_cloud':        '184',   # In MB
     # Manual atomic prerelease image sizes go here.
     'manual_pre_atomic_raw_cloud':    '446',   # In MB
     'manual_pre_atomic_qcow2_cloud':  '551',   # In MB
@@ -281,8 +281,8 @@ iso_size={
     'x86_64_ev':        '477',   #In MB
     'i386_ev':          '465',   #In MB
     # Everything prerelease
-    'pre_x86_64_ev':        '477',   #In MB
-    'pre_i386_ev':          '465',   #In MB
+    'pre_x86_64_ev':        '459',   #In MB
+    'pre_i386_ev':          '517',   #In MB
 }
 
 # Redirect EC2 images
diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html
index 5d85a41..2d48680 100644
--- a/spins.fedoraproject.org/data/content/prerelease.html
+++ b/spins.fedoraproject.org/data/content/prerelease.html
@@ -117,7 +117,7 @@
               </div>
               <div class="col-xs-6 text-center">
               <a class="btn btn-success btn-pre" href="${global_variables.path['download_arch']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXQt-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
-                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXQt']}</h5>
+                <h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXQt']}</h5>
               </div>
             </div>
            </div>