gitlab-ci: Update Fedora to version 36

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed May 18 07:56:52 UTC 2022 on sn-devel-184

12 files changed, 21 insertions, 21 deletions

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 57979463aa1..111be1556ff 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -97,10 +97,10 @@ ubuntu2004:
 debian11:
   extends: .build_image_template
 
-fedora35:
+fedora36:
   extends: .build_image_template
 
-f35mit120:
+f36mit120:
   extends: .build_image_template
 
 centos8s:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 6b3f97d4fd0..59d93b14686 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -488,9 +488,9 @@ RPM_DISTS = {
             'mold': '',
         }
     },
-    'fedora35': {
-        'docker_image': 'fedora:35',
-        'vagrant_box': 'fedora/35-cloud-base',
+    'fedora36': {
+        'docker_image': 'fedora:36',
+        'vagrant_box': 'fedora/36-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
@@ -499,9 +499,9 @@ RPM_DISTS = {
             'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
         }
     },
-    'f35mit120': {
-        'docker_image': 'fedora:35',
-        'vagrant_box': 'fedora/35-cloud-base',
+    'f36mit120': {
+        'docker_image': 'fedora:36',
+        'vagrant_box': 'fedora/36-cloud-base',
         'bootstrap': DNF_BOOTSTRAP_MIT,
         'replace': {
             'lsb-release': 'redhat-lsb',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 88afbaafb01..9b1b3f154d7 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,18 +31,18 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian11/locale.sh"
     end
 
-    config.vm.define "f35mit120" do |v|
-        v.vm.box = "fedora/35-cloud-base"
-        v.vm.hostname = "f35mit120"
-        v.vm.provision :shell, path: "f35mit120/bootstrap.sh"
-        v.vm.provision :shell, path: "f35mit120/locale.sh"
+    config.vm.define "f36mit120" do |v|
+        v.vm.box = "fedora/36-cloud-base"
+        v.vm.hostname = "f36mit120"
+        v.vm.provision :shell, path: "f36mit120/bootstrap.sh"
+        v.vm.provision :shell, path: "f36mit120/locale.sh"
     end
 
-    config.vm.define "fedora35" do |v|
-        v.vm.box = "fedora/35-cloud-base"
-        v.vm.hostname = "fedora35"
-        v.vm.provision :shell, path: "fedora35/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora35/locale.sh"
+    config.vm.define "fedora36" do |v|
+        v.vm.box = "fedora/36-cloud-base"
+        v.vm.hostname = "fedora36"
+        v.vm.provision :shell, path: "fedora36/bootstrap.sh"
+        v.vm.provision :shell, path: "fedora36/locale.sh"
     end
 
     config.vm.define "opensuse153" do |v|
diff --git a/bootstrap/generated-dists/f35mit120/Dockerfile b/bootstrap/generated-dists/f36mit120/Dockerfile
index e66eb84d9f3..8a4ecb6f97e 100644
--- a/bootstrap/generated-dists/f35mit120/Dockerfile
+++ b/bootstrap/generated-dists/f36mit120/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM fedora:35
+FROM fedora:36
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/f35mit120/bootstrap.sh b/bootstrap/generated-dists/f36mit120/bootstrap.sh
index 3b937f4abb1..3b937f4abb1 100755
--- a/bootstrap/generated-dists/f35mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f36mit120/bootstrap.sh
diff --git a/bootstrap/generated-dists/f35mit120/locale.sh b/bootstrap/generated-dists/f36mit120/locale.sh
index cc64e180483..cc64e180483 100755
--- a/bootstrap/generated-dists/f35mit120/locale.sh
+++ b/bootstrap/generated-dists/f36mit120/locale.sh
diff --git a/bootstrap/generated-dists/f35mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
index 0fb207dc137..0fb207dc137 100644
--- a/bootstrap/generated-dists/f35mit120/packages.yml
+++ b/bootstrap/generated-dists/f36mit120/packages.yml
diff --git a/bootstrap/generated-dists/fedora35/Dockerfile b/bootstrap/generated-dists/fedora36/Dockerfile
index e66eb84d9f3..8a4ecb6f97e 100644
--- a/bootstrap/generated-dists/fedora35/Dockerfile
+++ b/bootstrap/generated-dists/fedora36/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM fedora:35
+FROM fedora:36
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/fedora35/bootstrap.sh b/bootstrap/generated-dists/fedora36/bootstrap.sh
index ad38475228f..ad38475228f 100755
--- a/bootstrap/generated-dists/fedora35/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora36/bootstrap.sh
diff --git a/bootstrap/generated-dists/fedora35/locale.sh b/bootstrap/generated-dists/fedora36/locale.sh
index cc64e180483..cc64e180483 100755
--- a/bootstrap/generated-dists/fedora35/locale.sh
+++ b/bootstrap/generated-dists/fedora36/locale.sh
diff --git a/bootstrap/generated-dists/fedora35/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
index 0fb207dc137..0fb207dc137 100644
--- a/bootstrap/generated-dists/fedora35/packages.yml
+++ b/bootstrap/generated-dists/fedora36/packages.yml
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index d0359be9b54..9c3a115d95f 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e
+a6e30c371ba434b89af5628bd1974e5cc947eb9f