From 8d9864fb5afafc5f9df8adfeeade3b0bee493a40 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Mar 21 2020 10:41:12 +0000
Subject: Merge branch 'master' of pagure.io:fedora-websites


---

diff --git a/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM b/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM
new file mode 100644
index 0000000..e9577d7
--- /dev/null
+++ b/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-aarch64-CHECKSUM
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+# Fedora-Cloud-Base-32_Beta-1.2.aarch64.qcow2: 338952192 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.qcow2) = c12716fdfca8bee62816582bcc39d85d0b778f7d5c5c4d516c2e964a57174418
+# Fedora-Cloud-Base-32_Beta-1.2.aarch64.raw.xz: 231357584 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.raw.xz) = 58a0970d80cc9f8c0d2778ade16757db490dba7138b15329563270c41dd6a378
+# Fedora-Cloud-Base-32_Beta-1.2.aarch64.vmdk: 956628992 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.aarch64.vmdk) = 8de82e17d7b12eea47e9974c49e5e626a5c515290f0f1017d85210ae391d09ca
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCAAGBQJea+ZPAAoJEGwTAm0SyUTQerQP/1GpJf/tlG1U7qpJNneVkd2M
+nuhgwVc8Lw2NmC6OVEsNrkWNPbEdhBLo/V3mtELWpe17jTJ9YnJo7aLQGAIKfkQH
+vaUcniF9MPjzZ945Fsy+fOLxELXGX2WoIIL2aTdw8dKInE7mUxUPr8W9nCKY5UO0
+kQU18WaLSddONWAj/AcGvYiP14H88k/3Jm8DMBo6uTHT5WrmgP7uSSoBCQTj3TCe
+7IDEVZefI7lzETYXzK3xIaNEHIcZTPVC8yMclhJlbNbo8R6wfE5rI6ZsNExMb2Ze
+KgRFvloCLFeYnY+5e5l/65h24QJsnNnC92iLD0sYgde1TfMLezcQ3MQSXn0TUEMZ
+0oCe/pqYMSMMsmYkBCmf3KHx/ZuBcvECni0UUAG6TTlsJcFg268j9w0IvA6tmtsQ
+YF76/sp4Si0mVc9QJ/S1kQGn1+Ykm+iWCvFQ/14S1tInJKVZi3D/7QtiFlhfjqWd
+Kp8Y9dwa0/ILeQZChwEHvniNUuPxM2FRoxikp51Dt8Zy4/TJoFd66vBSgeQmfsqY
+pqM65aU1wTSVqfQ44mOB7PUKwV3bI7A3lDF2jb6rWN3uIXLMSUgQm89NYbd432dR
+UztBGVJGOWa0O3vMXczQKjpgS2ZTymxs6dpmcZBf/puXZoS7qg58sW6Tn5f56gcO
+yy8VO5O0US02VyUIkmOM
+=RYym
+-----END PGP SIGNATURE-----
diff --git a/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM b/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM
new file mode 100644
index 0000000..5794a8e
--- /dev/null
+++ b/alt.fedoraproject.org/static/checksums/Fedora-Cloud-32_Beta-1.2-x86_64-CHECKSUM
@@ -0,0 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+# Fedora-Cloud-Base-32_Beta-1.2.x86_64.qcow2: 336592896 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.qcow2) = 3ff094bc37d6ddf21c617e479a84597b2c15e06003e8f5b4c3a0529979626ef9
+# Fedora-Cloud-Base-32_Beta-1.2.x86_64.raw.xz: 233506408 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.raw.xz) = ba3f4f8c41c295ecd35057844764a02fbee6be807ff5c8abba9f23b4e6b1f2e0
+# Fedora-Cloud-Base-32_Beta-1.2.x86_64.vmdk: 874512384 bytes
+SHA256 (Fedora-Cloud-Base-32_Beta-1.2.x86_64.vmdk) = 2b9de4df3e85db40ff469e8fa53587c15bc4018b6dd55c7f90180cf5914095b1
+# Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-libvirt.box: 316485889 bytes
+SHA256 (Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-libvirt.box) = 40cc043c642a594946c67b05010dbe9ed2bbf825d618355fe192694efcd9610f
+# Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-virtualbox.box: 331100160 bytes
+SHA256 (Fedora-Cloud-Base-Vagrant-32_Beta-1.2.x86_64.vagrant-virtualbox.box) = ec931a64c5ca488ae7809f3a3cb6049acc6141438cbabbbe8156b8a0ca2d4e62
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCAAGBQJea+ZJAAoJEGwTAm0SyUTQjCUP/RtrO6BjfcMgoMCg2BCfc2wZ
+nBu7QHssrik0+1hg+X04gYzyKk+rI0mUGTBpjjn2znbmWx76ZGV6hLbyWWVVlPbU
+rgrh6iAfj2pUvK2gUKnujwiPx7VgHfXnhX7qcdnI+ATh0dxOtB1VX1ANLDllbHWW
+F56MT5a44uOhjoUR/RtlDRF45jGL3VQ/svKv5X/fmfBFy+aj9Krwqu4ok8NoRHhd
+TUqDg4fLd2OKRrN1MF6tMbUtPbz7q15D0Cii2A8WiTdTpu5j0b+18r5Of69Jmw5S
+lfn7wpGEThemfJaZpQgWD6r+vWzWFYJajMBZkLiDGdWaNllPc1et5AQCtievP6ge
+pDPwpa8dm2gMW4zArrjQomLETFQbS23ziEKbmEpCvj+S79uQGGETsS6V3/B1NG7e
+zrLjtVtZD1zyAnmHewxIquMrY4ijm/ryDfAPz2g0amMGxWTplwDVocrKnFkIgq5y
+hwS2aHMuO4WrMlY3JMfxD22NHW5MpH6O1wEcdlYVMhEXtqHn55n7CCEb4kH2mH5w
+g//7ZHyH28s+3ygKjvo5EodWkjI+I8g3EF8Is5MFKhqp1If6q7y2PA5O1xlVQdJX
+684V79GNv59uyLHb9HsfAmroYCr4n/0boB2kVpnKY6TxI5QDzdNMA+e0AtyrsJFK
+Ivnr8oNx1bp4/15pmulm
+=DMie
+-----END PGP SIGNATURE-----
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 305bf60..4cc80e8 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -467,37 +467,37 @@ AARCH64_GP2_HVM_atomic_AMI={}
 
 # EC2 AMI IDs PRERELEASE!!!
 pre_HVM_base_AMI={
-    'ap-northeast-1':  'ami-0df283a7df814088a',
-    'ap-northeast-2':  'ami-00019f41ee614202b',
-    'ap-south-1':      'ami-04161766142c985d0',
-    'ap-southeast-1':  'ami-08479c9ede08f0b90',
-    'ap-southeast-2':  'ami-035ae85a2b0dba53f',
-    'ca-central-1':    'ami-074898c90e5e6ad67',
-    'eu-central-1':    'ami-013b0d8268edfcca6',
-    'eu-west-1':       'ami-069824c3215b6a9b3',
-    'eu-west-2':       'ami-016f96780e908bf4d',
-    'sa-east-1':       'ami-0e995b54b555f3344',
-    'us-east-1':       'ami-04520caa6eb9ffc1f',
-    'us-east-2':       'ami-0aec7e421376b5f58',
-    'us-west-1':       'ami-0dd7e9e23749eb2df',
-    'us-west-2':       'ami-0e86301bce37e5e36'
+    'ap-northeast-1':  'ami-053db6774d7445008',
+    'ap-northeast-2':  'ami-0442ce2f15031feb4',
+    'ap-south-1':      'ami-06fc0551e1d52cef7',
+    'ap-southeast-1':  'ami-01aa690f13cd7c4cb',
+    'ap-southeast-2':  'ami-0d5379ab9e543f8c9',
+    'ca-central-1':    'ami-039195f65eace16e5',
+    'eu-central-1':    'ami-0ae7e51b5eacc4cfa',
+    'eu-west-1':       'ami-02e9b94502ffdd3b9',
+    'eu-west-2':       'ami-0fac4adf87a0b23be',
+    'sa-east-1':       'ami-02226636bef6e4bfe',
+    'us-east-1':       'ami-0f4f76118f4ca5b59',
+    'us-east-2':       'ami-08387bf7d423dd979',
+    'us-west-1':       'ami-067f7c28153092394',
+    'us-west-2':       'ami-07650985f321a99f3'
 }
 
 pre_GP2_HVM_base_AMI={
-    'ap-northeast-1':  'ami-00512847289ac69e5',
-    'ap-northeast-2':  'ami-0f755c41c262380b8',
-    'ap-south-1':      'ami-0159f61e7af6edefa',
-    'ap-southeast-1':  'ami-0e98edf3171f145fb',
-    'ap-southeast-2':  'ami-0599cbd94a5b6c7c9',
-    'ca-central-1':    'ami-0834d50b72d10742e',
-    'eu-central-1':    'ami-0a8fee007f6e05976',
-    'eu-west-1':       'ami-0ab4231b322d6b2c8',
-    'eu-west-2':       'ami-0d364c384f03a6973',
-    'sa-east-1':       'ami-0dc599e078e09e233',
-    'us-east-1':       'ami-0645061389aac9c7b',
-    'us-east-2':       'ami-0c64ce1ce83eda53c',
-    'us-west-1':       'ami-071d169b6f75e0a1c',
-    'us-west-2':       'ami-0760d1937ffd9c65a'
+    'ap-northeast-1':  'ami-0a3e5ecd1af437cf6',
+    'ap-northeast-2':  'ami-0b045a55b71328675',
+    'ap-south-1':      'ami-0af5597b67dca44b2',
+    'ap-southeast-1':  'ami-0f7c110aa63ebf24f',
+    'ap-southeast-2':  'ami-06a13536a962bff9f',
+    'ca-central-1':    'ami-0500fc6a8144abc1e',
+    'eu-central-1':    'ami-0bfe51e7af68b9980',
+    'eu-west-1':       'ami-000b9d8c6830276dd',
+    'eu-west-2':       'ami-0be03c632b49517eb',
+    'sa-east-1':       'ami-067b6e5526e573986',
+    'us-east-1':       'ami-06c522b66d738d1b4',
+    'us-east-2':       'ami-0d4391c189dbf5314',
+    'us-west-1':       'ami-036700754636cd5d6',
+    'us-west-2':       'ami-0b5bffa2ebe93b6b1'
 }
 
 pre_PV_base_AMI={