gitlab-ci: Update Fedora to version 42

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Apr 30 09:41:38 UTC 2025 on atb-devel-224

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 216e996f42d9c0dc87ca2ca141ffcdfcb9f051b4..3b8649a988869d665f24824622cc30e3ce3dba2e 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: 26a734ea226b4fd32141ae950af16f75f290645f
+  SAMBA_CI_CONTAINER_TAG: cc3865d5074e9898e4a7ffab6fa056ab63ee46ee
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
@@ -66,7 +66,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155
   SAMBA_CI_CONTAINER_IMAGE_rocky8: rocky8
   SAMBA_CI_CONTAINER_IMAGE_centos9s: centos9s
-  SAMBA_CI_CONTAINER_IMAGE_fedora41: fedora41
+  SAMBA_CI_CONTAINER_IMAGE_fedora42: fedora42
 
 include:
   # The image creation details are specified in a separate file
@@ -267,13 +267,13 @@ samba-def-build:
 samba-mit-build:
   extends: .shared_template_build_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
   needs:
     - job: samba-mit-build
       artifacts: true
@@ -321,7 +321,7 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
 
 samba-minimal-smbd:
   extends: .shared_template
@@ -391,7 +391,7 @@ samba-addc-mit-4b:
 samba-fips:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
 
 samba-codecheck:
   extends: .shared_template
@@ -672,10 +672,10 @@ centos9s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos9s}
 
-fedora41-samba-o3:
+fedora42-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
 
 #
 # Keep the samba-o3 sections at the end ...

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 0b37863d35ad721862450191fb7706e532cc7ef6..48ea3b887a0b970f1be37b084b4ba15f831b3dea 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -99,7 +99,7 @@ debian11:
 debian12:
   extends: .build_image_template
 
-fedora41:
+fedora42:
   extends: .build_image_template
 
 debian11-32bit:

diff --git a/bootstrap/config.py b/bootstrap/config.py
index dbc0f96a539a5c691dc7ec1582a0192f4db048f9..69978313645bdb59435eb231fb86bec78a3b7382 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -562,9 +562,9 @@ RPM_DISTS = {
             'python3-varlink': '', # not available
         }
     },
-    'fedora41': {
-        'docker_image': 'quay.io/fedora/fedora:41',
-        'vagrant_box': 'fedora/41-cloud-base',
+    'fedora42': {
+        'docker_image': 'quay.io/fedora/fedora:42',
+        'vagrant_box': 'fedora/42-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index d4d3c29580cfe51cd6924558bebb8970220f5886..d901a3770cf5c270a82266175d4197df3db00c03 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -45,11 +45,11 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian12-32bit/locale.sh"
     end
 
-    config.vm.define "fedora41" do |v|
-        v.vm.box = "fedora/41-cloud-base"
-        v.vm.hostname = "fedora41"
-        v.vm.provision :shell, path: "fedora41/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora41/locale.sh"
+    config.vm.define "fedora42" do |v|
+        v.vm.box = "fedora/42-cloud-base"
+        v.vm.hostname = "fedora42"
+        v.vm.provision :shell, path: "fedora42/bootstrap.sh"
+        v.vm.provision :shell, path: "fedora42/locale.sh"
     end
 
     config.vm.define "opensuse155" do |v|

diff --git a/bootstrap/generated-dists/fedora41/Dockerfile b/bootstrap/generated-dists/fedora42/Dockerfile
similarity index 97%
rename from bootstrap/generated-dists/fedora41/Dockerfile
rename to bootstrap/generated-dists/fedora42/Dockerfile
index b45f8243f325cffea19758d772ac191e415febd7..5f063cdc27c4e41739e24f9b68ebdceda923c083 100644 (file)
--- a/bootstrap/generated-dists/fedora41/Dockerfile
+++ b/bootstrap/generated-dists/fedora42/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM quay.io/fedora/fedora:41
+FROM quay.io/fedora/fedora:42
 
 # pass in with --build-arg while build
 ARG SHA1SUM

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

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

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

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 39ed53b31caa58b97a9ed8e49556c44562f0f130..43732b284ca7d0d2b18685c5a4bb3e0e04a8e4ca 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-26a734ea226b4fd32141ae950af16f75f290645f
+cc3865d5074e9898e4a7ffab6fa056ab63ee46ee