From cdaf2ccb0bfc2da472b194e48f886f8e3d8598e5 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 28 2019 13:36:07 +0000 Subject: [PATCH 1/9] ppc - desktop - enable and fix cloud and container images --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 792dd28..b2a5773 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -468,21 +468,6 @@

${_('Download')} | ${_('Verify')}

- From 36039e8fa02593039c69f9006d8f12e0c61bbdcb Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 28 2019 15:05:38 +0000 Subject: [PATCH 2/9] ppc - mobile, tablet - drop ppc64 entries completely --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index b2a5773..cd78a27 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -523,77 +523,6 @@

${_('Power Architecture')}

-
-
-

${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}

-
-
-
-
-
- -
-
-

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Everything')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

-
-
- -

${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}

@@ -675,91 +604,6 @@

${_('Power Architecture')}

-
-
-

${_('These images are for installation on IBM Power systems or OpenPOWER systems.')}

-
-
-
-
-
- -
-
-

${_('Fedora Server')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Server')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Everything')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

${_('Download')} | ${_('Verify')}

-
-
- -

${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}

From ce28c5f3a6ee83030c8af4ff489bfed5681003ef Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 28 2019 15:06:52 +0000 Subject: [PATCH 3/9] ppc - mobile, tablet - drop ppc64le Cloud netinst image --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index cd78a27..839b704 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -562,15 +562,6 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

${_('Download')} | ${_('Verify')}

@@ -651,17 +642,6 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

-
- -
-
- -
-
-

${_('Fedora Cloud')}

-
-

${_('Download')} | ${_('Verify')}

From 6abdd2cb537df6659bcd96a48f9d3cbfe0c89ca6 Mon Sep 17 00:00:00 2001 From: Dan Date: Nov 29 2019 10:50:07 +0000 Subject: [PATCH 4/9] globalvar - add missing s390x artifacts --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index dae327b..7952332 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -140,6 +140,9 @@ iso_size={ 'ppc64le_raw': '159', # In MB 'ppc64le_Container': '43', # In MB 's390x_Server_DVD': '2.7', # In GB + 's390x_qcow2': '273', # In MB + 's390x_raw': '159', # In MB + 's390x_Container': '43', # In MB 'i686_sda.qcow2': '212', # In MB 'x86_64_sda.qcow2': '207', # In MB 'i686_raw': '122', # In MB From e5b7033b0abf1842c5f952dac1341ac6e49b7f12 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 29 2019 10:57:49 +0000 Subject: [PATCH 5/9] s390x - desktop, mobile, tablet - add cloud and container images --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 839b704..0d54de7 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -746,6 +746,48 @@

${_('Download')} | ${_('Verify')}

+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['s390x_qcow2']}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

${Markup(_('%sMB raw image')) % global_variables.iso_size['s390x_raw']}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+
+
+

${Markup(_('%sMB Container image')) % global_variables.iso_size['s390x_Container']}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
@@ -783,6 +825,33 @@

${_('Download')} | ${_('Verify')}

+
+
+ +
+
+

${_('Fedora Cloud')}

+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+

${_('Download')} | ${_('Verify')}

+
+
@@ -823,6 +892,39 @@

${_('Download')} | ${_('Verify')}

+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
From 56520790689e9d313e6f2abb5f44d32b4eb65546 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 29 2019 11:04:44 +0000 Subject: [PATCH 6/9] globalvar - update ppc64le and s390x sizes --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 7952332..2e9bbb0 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -133,16 +133,16 @@ iso_size={ 'ppc64_qcow2': '282', # In MB 'ppc64_raw': '158', # In MB 'ppc64_Container': '43', # In MB - 'ppc64le_Server_DVD': '2.8', # In GB - 'ppc64le_Server_net': '578', # In MB + 'ppc64le_Server_DVD': '1.9', # In GB + 'ppc64le_Server_net': '619', # In MB 'ppc64le_Cloud_net': '488', # In MB - 'ppc64le_qcow2': '273', # In MB - 'ppc64le_raw': '159', # In MB - 'ppc64le_Container': '43', # In MB - 's390x_Server_DVD': '2.7', # In GB - 's390x_qcow2': '273', # In MB - 's390x_raw': '159', # In MB - 's390x_Container': '43', # In MB + 'ppc64le_qcow2': '366', # In MB + 'ppc64le_raw': '232', # In MB + 'ppc64le_Container': '42', # In MB + 's390x_Server_DVD': '1.7', # In GB + 's390x_qcow2': '360', # In MB + 's390x_raw': '222', # In MB + 's390x_Container': '37', # In MB 'i686_sda.qcow2': '212', # In MB 'x86_64_sda.qcow2': '207', # In MB 'i686_raw': '122', # In MB From 6e67087bb077eebf8a4c3ae8604877c241bb70ae Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 29 2019 11:13:26 +0000 Subject: [PATCH 7/9] s390x - add server netinst --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 0d54de7..d3f58a6 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -734,6 +734,20 @@
+ +
+
+

${_('Fedora Server')}

+
+
+

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['s390x_Server_net']}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
@@ -818,6 +832,15 @@
+ +
+
+

${_('Fedora Server')}

+

${_('Download')} | ${_('Verify')}

+
+
+
+
@@ -883,6 +906,17 @@
+ +
+
+

${_('Fedora Server')}

+
+
+

${_('Download')} | ${_('Verify')}

+
+
+
+
diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 2e9bbb0..e714747 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -140,6 +140,7 @@ iso_size={ 'ppc64le_raw': '232', # In MB 'ppc64le_Container': '42', # In MB 's390x_Server_DVD': '1.7', # In GB + 's390x_Server_net': '484', # In MB 's390x_qcow2': '360', # In MB 's390x_raw': '222', # In MB 's390x_Container': '37', # In MB From 1a2a1c7f05975d329f8a821bc6c66fe301354964 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 29 2019 12:07:06 +0000 Subject: [PATCH 8/9] ppc - refer to RC_gold_ppc64le for ppc64le artifacts --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index d3f58a6..8f8d238 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -437,7 +437,7 @@

${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64le_Server_DVD']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -451,7 +451,7 @@

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Server_net']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -465,7 +465,7 @@

${Markup(_('%sMB dvd iso')) % global_variables.iso_size['ppc64le_ev']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -479,7 +479,7 @@

${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['ppc64le_qcow2']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -493,7 +493,7 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['ppc64le_raw']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -507,7 +507,7 @@

${Markup(_('%sMB Container image')) % global_variables.iso_size['ppc64le_Container']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -535,7 +535,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -544,7 +544,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -553,7 +553,7 @@

${_('Everything')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -562,7 +562,7 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -571,7 +571,7 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -580,7 +580,7 @@

${_('Fedora Container')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -609,7 +609,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -620,7 +620,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -631,7 +631,7 @@

${_('Everything')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -642,7 +642,7 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -653,7 +653,7 @@

${_('Fedora Cloud')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -664,7 +664,7 @@

${_('Fedora Container')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

diff --git a/build.d/globalvar.py b/build.d/globalvar.py index e714747..184b3f5 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -59,6 +59,7 @@ release={ 'RC_build': '1.9', # sometimes releng use the RC build 'RC_gold_aarch64': '1.9', # RC Gold for aarch64 'RC_gold_ppc64': '1.9', # RC Gold for ppc64 + 'RC_gold_ppc64le': '1.9', # RC Gold for ppc64le 'RC_gold_s390x': '1.9', # RC Gold for s390x 'RC_pre_gold': '1.1', # insert the number of the prerelease RC version declared GOLD 'RC_pre_build': '2', # sometimes releng use the RC build From 50ae024a91d24eaa439a3767a03e119111109fa6 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Nov 29 2019 12:27:09 +0000 Subject: [PATCH 9/9] verify - add entries for ppc64le and s390x --- diff --git a/alt.fedoraproject.org/data/content/verify.html b/alt.fedoraproject.org/data/content/verify.html index fff2bf6..1ef3085 100644 --- a/alt.fedoraproject.org/data/content/verify.html +++ b/alt.fedoraproject.org/data/content/verify.html @@ -70,13 +70,12 @@
${_('For aarch64 images')}
- + ${_('For s390x images')} +
${_('For Cloud Base images')}
@@ -89,11 +88,12 @@
${_('For aarch64')}
-