gitlab-ci: Update Fedora to version 37

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 Nov 16 16:29:30 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 314d5210ca6381f9eed5c2879603feaa9d291ece..f1f9908dc5598c23547c7f3edf86b85ce3d5047d 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: afb5d32dfeebf0f100bdf9073f0c802d051ec15e
+  SAMBA_CI_CONTAINER_TAG: e3639b136a9b626936e849fb2976ebeed7e4fd3b
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -62,8 +62,8 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
   SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
   SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154
-  SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36
-  SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120
+  SAMBA_CI_CONTAINER_IMAGE_fedora37: fedora37
+  SAMBA_CI_CONTAINER_IMAGE_f37mit120: f37mit120
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
   SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
 
@@ -261,20 +261,20 @@ samba-def-build:
 samba-mit-build:
   extends: .shared_template_build_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
   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_f36mit120}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
   needs:
     - job: samba-mit-build
       artifacts: true
@@ -283,7 +283,7 @@ samba-mit120-build:
 .needs_samba-mit120-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120}
   needs:
     - job: samba-mit120-build
       artifacts: true
@@ -330,7 +330,7 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
 
 samba-minimal-smbd:
   extends: .shared_template
@@ -399,13 +399,13 @@ samba-addc-mit-4b:
 samba-fips:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
 
 samba-shellcheck:
   extends: .shared_template
   needs:
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
   stage: build_first
 
 .private_test_only:
@@ -648,10 +648,10 @@ centos8s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
 
-fedora36-samba-o3:
+fedora37-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37}
 
 #
 # Keep the samba-o3 sections at the end ...

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index a9777348334fc85e7d6e288120d7baa884e5dc20..dff5cd2bf945e6b62c9bc9469e431d5b4afaa908 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-
+---
 .build_image_template:
   image: quay.io/podman/stable:latest
   stage: images
@@ -97,10 +97,10 @@ ubuntu2004:
 debian11:
   extends: .build_image_template
 
-fedora36:
+fedora37:
   extends: .build_image_template
 
-f36mit120:
+f37mit120:
   extends: .build_image_template
 
 centos8s:

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 9546db1fb28325cd29764bfbb253ff9273352e34..048f256ef2e0731cf29db831a827c3bf5ba9187b 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -495,9 +495,9 @@ RPM_DISTS = {
             'shfmt': '',
         }
     },
-    'fedora36': {
-        'docker_image': 'quay.io/fedora/fedora:36',
-        'vagrant_box': 'fedora/36-cloud-base',
+    'fedora37': {
+        'docker_image': 'quay.io/fedora/fedora:37',
+        'vagrant_box': 'fedora/37-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
@@ -506,9 +506,9 @@ RPM_DISTS = {
             'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
         }
     },
-    'f36mit120': {
-        'docker_image': 'quay.io/fedora/fedora:36',
-        'vagrant_box': 'fedora/36-cloud-base',
+    'f37mit120': {
+        'docker_image': 'quay.io/fedora/fedora:37',
+        'vagrant_box': 'fedora/37-cloud-base',
         'bootstrap': DNF_BOOTSTRAP_MIT,
         'replace': {
             'lsb-release': 'redhat-lsb',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 28f8f89b7d9f60917f107592df7ffa832066a7fc..dad82c1e5029f0c54953b9dfad856b91e2fa8886 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 "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"
+    config.vm.define "f37mit120" do |v|
+        v.vm.box = "fedora/37-cloud-base"
+        v.vm.hostname = "f37mit120"
+        v.vm.provision :shell, path: "f37mit120/bootstrap.sh"
+        v.vm.provision :shell, path: "f37mit120/locale.sh"
     end
 
-    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"
+    config.vm.define "fedora37" do |v|
+        v.vm.box = "fedora/37-cloud-base"
+        v.vm.hostname = "fedora37"
+        v.vm.provision :shell, path: "fedora37/bootstrap.sh"
+        v.vm.provision :shell, path: "fedora37/locale.sh"
     end
 
     config.vm.define "opensuse154" do |v|

diff --git a/bootstrap/generated-dists/f36mit120/Dockerfile b/bootstrap/generated-dists/f37mit120/Dockerfile
similarity index 92%
rename from bootstrap/generated-dists/f36mit120/Dockerfile
rename to bootstrap/generated-dists/f37mit120/Dockerfile
index 8ceb585b6fdcb1f5d4055ac658c9f7a792128f1d..6e4c2cfd8fbe76aad25b00445b9f5ff5ad4a225d 100644 (file)
--- a/bootstrap/generated-dists/f36mit120/Dockerfile
+++ b/bootstrap/generated-dists/f37mit120/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM quay.io/fedora/fedora:36
+FROM quay.io/fedora/fedora:37
 
 # pass in with --build-arg while build
 ARG SHA1SUM

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

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

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

diff --git a/bootstrap/generated-dists/fedora36/Dockerfile b/bootstrap/generated-dists/fedora37/Dockerfile
similarity index 92%
rename from bootstrap/generated-dists/fedora36/Dockerfile
rename to bootstrap/generated-dists/fedora37/Dockerfile
index 8ceb585b6fdcb1f5d4055ac658c9f7a792128f1d..6e4c2cfd8fbe76aad25b00445b9f5ff5ad4a225d 100644 (file)
--- a/bootstrap/generated-dists/fedora36/Dockerfile
+++ b/bootstrap/generated-dists/fedora37/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM quay.io/fedora/fedora:36
+FROM quay.io/fedora/fedora:37
 
 # pass in with --build-arg while build
 ARG SHA1SUM

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

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

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

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b87fad087bb422978a4bd36eaad3a4318ed114c5..9d2e589a876bb1d9fa981a00b39658d30d5e98cd 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-afb5d32dfeebf0f100bdf9073f0c802d051ec15e
+e3639b136a9b626936e849fb2976ebeed7e4fd3b