gitlab-ci: Move to Fedora 41

Python 3.13 removed the `crypt` module. I can work around it on Fedora 41, but
we need to address this better sooner than later.

See also https://bugzilla.samba.org/show_bug.cgi?id=15756

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 8220840d74118f601d888b844d6be207afe724ea..fca228d9af24f6c5baafb07f812d14676caf213a 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: 936722ecb26bedf6ea0acd9228963ce45ed419d4
+  SAMBA_CI_CONTAINER_TAG: b86ed4890ab0f95b15d3f3b11d1cd21327ac045f
   #
   # 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_fedora40: fedora40
+  SAMBA_CI_CONTAINER_IMAGE_fedora41: fedora41
 
 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_fedora40}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
   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_fedora40}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
 
 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_fedora40}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
 
 samba-codecheck:
   extends: .shared_template
@@ -672,10 +672,10 @@ centos9s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos9s}
 
-fedora40-samba-o3:
+fedora41-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora41}
 
 #
 # Keep the samba-o3 sections at the end ...

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index ac2b4ebed09a6ebf3af593af0fc30fb669fb3c8e..1d0ca0246dafda60b5cd8325c51be2a30f882f8e 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -98,7 +98,7 @@ debian11:
 debian12:
   extends: .build_image_template
 
-fedora40:
+fedora41:
   extends: .build_image_template
 
 debian11-32bit:

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 8b2672f9dddb7d49cf7eda31aefa90fa2de3b3bf..465e9157169ced162156f0d1778928097aff8711 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -159,6 +159,10 @@ PKGS = [
     ('', 'python3-libsemanage'),
     ('', 'python3-policycoreutils'),
 
+    # A copy of the `crypt` module that was removed in Python 3.13
+    # See also https://bugzilla.samba.org/show_bug.cgi?id=15756
+    ('', 'python3-crypt-r'),
+
     # perl
     ('libparse-yapp-perl', 'perl-Parse-Yapp'),
     ('perl-modules', ''),
@@ -534,6 +538,7 @@ RPM_DISTS = {
             'ShellCheck': '',
             'shfmt': '',
             'codespell': '',
+            'python3-crypt-r': '',
         }
     },
     'centos9s': {
@@ -553,11 +558,12 @@ RPM_DISTS = {
             'codespell': '',
             'libcephfs-devel': '',  # not available anymore
             'curl': '',  # Use installed curl-minimal
+            'python3-crypt-r': '',
         }
     },
-    'fedora40': {
-        'docker_image': 'quay.io/fedora/fedora:40',
-        'vagrant_box': 'fedora/40-cloud-base',
+    'fedora41': {
+        'docker_image': 'quay.io/fedora/fedora:41',
+        'vagrant_box': 'fedora/41-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
@@ -581,6 +587,7 @@ RPM_DISTS = {
             'keyutils-libs-devel': 'keyutils-devel',
             'krb5-workstation': 'krb5-client',
             'python3-libsemanage': 'python3-semanage',
+            'python3-crypt-r': '',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
             'perl-JSON-Parse': 'perl-JSON-XS',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index c1809cfe6b8bcda161b2d54c05fc4c79edd1ad38..d4d3c29580cfe51cd6924558bebb8970220f5886 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 "fedora40" do |v|
-        v.vm.box = "fedora/40-cloud-base"
-        v.vm.hostname = "fedora40"
-        v.vm.provision :shell, path: "fedora40/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora40/locale.sh"
+    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"
     end
 
     config.vm.define "opensuse155" do |v|

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

diff --git a/bootstrap/generated-dists/fedora40/bootstrap.sh b/bootstrap/generated-dists/fedora41/bootstrap.sh
similarity index 99%
rename from bootstrap/generated-dists/fedora40/bootstrap.sh
rename to bootstrap/generated-dists/fedora41/bootstrap.sh
index 22d2fa8974509072eb28550ae4273dc1cd64cfb4..941f7b321851310d5fda22110002f3d890534487 100755 (executable)
--- a/bootstrap/generated-dists/fedora40/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora41/bootstrap.sh
@@ -92,6 +92,7 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
+    python3-crypt-r \
     python3-cryptography \
     python3-dateutil \
     python3-devel \

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

diff --git a/bootstrap/generated-dists/fedora40/packages.yml b/bootstrap/generated-dists/fedora41/packages.yml
similarity index 98%
rename from bootstrap/generated-dists/fedora40/packages.yml
rename to bootstrap/generated-dists/fedora41/packages.yml
index 532ac877fddbb649175fff8af27c762609a9106f..f00bacbd98891a0c5a58a2b81849de360b80ae43 100644 (file)
--- a/bootstrap/generated-dists/fedora40/packages.yml
+++ b/bootstrap/generated-dists/fedora41/packages.yml
@@ -81,6 +81,7 @@ packages:
   - procps-ng
   - psmisc
   - python3
+  - python3-crypt-r
   - python3-cryptography
   - python3-dateutil
   - python3-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 25a8e482d2cc10aa02fec467e08fc324c084e26b..7c18889773acbdeb32ce9ae39b37c41fbbdf4f84 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-936722ecb26bedf6ea0acd9228963ce45ed419d4
+b86ed4890ab0f95b15d3f3b11d1cd21327ac045f