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

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 440567e125311fa9d32721d525b3ddbd49fcc1fc..02b22b1571f96e3110dbaa651da43ee75f1af12a 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e
+  SAMBA_CI_CONTAINER_TAG: a6e30c371ba434b89af5628bd1974e5cc947eb9f
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -57,8 +57,8 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
   SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
   SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
-  SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
-  SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120
+  SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36
+  SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
   SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
 
@@ -255,20 +255,20 @@ samba-def-build:
 samba-mit-build:
   extends: .shared_template_build_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
   stage: build_first
 
 samba-mit120-build:
   extends: .shared_template_build_only
   variables:
     AUTOBUILD_JOB_NAME: samba-mit-build
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f35mit120}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
   needs:
     - job: samba-mit-build
       artifacts: true
@@ -276,7 +276,7 @@ samba-mit120-build:
 .needs_samba-mit120-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f35mit120}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
   needs:
     - job: samba-mit120-build
       artifacts: true
@@ -323,7 +323,7 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
 
 samba-minimal-smbd:
   extends: .shared_template
@@ -392,7 +392,7 @@ samba-addc-mit-4b:
 samba-fips:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
 
 .private_test_only:
   extends: .private_runner_test
@@ -634,10 +634,10 @@ centos8s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
 
-fedora35-samba-o3:
+fedora36-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
 
 #
 # Keep the samba-o3 sections at the end ...

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 57979463aa133f4432d5988893873a4a00c8c828..111be1556ffb255ada9df8d63eb09afd2160ee5e 100644 (file)
--- 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 6b3f97d4fd00d99260a0890437acbb51c5833cef..59d93b1468634648560c4a622e0e541cee8fccd9 100644 (file)
--- 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 88afbaafb01b28c0cc39606419037c06dacb171a..9b1b3f154d78a1e753b2f48982752f951b196853 100644 (file)
--- 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
similarity index 93%
rename from bootstrap/generated-dists/f35mit120/Dockerfile
rename to bootstrap/generated-dists/f36mit120/Dockerfile
index e66eb84d9f396e4f22e1989aac091d8f3d238c85..8a4ecb6f97e97f0f8fea8aafe177ce8327d3a4ed 100644 (file)
--- 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
similarity index 100%
rename from bootstrap/generated-dists/f35mit120/bootstrap.sh
rename to bootstrap/generated-dists/f36mit120/bootstrap.sh

diff --git a/bootstrap/generated-dists/f35mit120/locale.sh b/bootstrap/generated-dists/f36mit120/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/f35mit120/locale.sh
rename to bootstrap/generated-dists/f36mit120/locale.sh

diff --git a/bootstrap/generated-dists/f35mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
similarity index 100%
rename from bootstrap/generated-dists/f35mit120/packages.yml
rename to bootstrap/generated-dists/f36mit120/packages.yml

diff --git a/bootstrap/generated-dists/fedora35/Dockerfile b/bootstrap/generated-dists/fedora36/Dockerfile
similarity index 93%
rename from bootstrap/generated-dists/fedora35/Dockerfile
rename to bootstrap/generated-dists/fedora36/Dockerfile
index e66eb84d9f396e4f22e1989aac091d8f3d238c85..8a4ecb6f97e97f0f8fea8aafe177ce8327d3a4ed 100644 (file)
--- 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
similarity index 100%
rename from bootstrap/generated-dists/fedora35/bootstrap.sh
rename to bootstrap/generated-dists/fedora36/bootstrap.sh

diff --git a/bootstrap/generated-dists/fedora35/locale.sh b/bootstrap/generated-dists/fedora36/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/fedora35/locale.sh
rename to bootstrap/generated-dists/fedora36/locale.sh

diff --git a/bootstrap/generated-dists/fedora35/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
similarity index 100%
rename from bootstrap/generated-dists/fedora35/packages.yml
rename to bootstrap/generated-dists/fedora36/packages.yml

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index d0359be9b5427958db565217c27ac29959aa790e..9c3a115d95f0465ae47132ba1a256b462662de22 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e
+a6e30c371ba434b89af5628bd1974e5cc947eb9f