gitlab-ci: Update image to Fedora 40

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Jun 13 13:29:48 UTC 2024 on atb-devel-224

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index d076a77cf17bedb640ea2c875dad6c23bcf9adff..ac7e403cd037a1bc79a51a1bf29e3d62eedb7efe 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: 3e791f1081a27f9462da4db20f186c9eaf592500
+  SAMBA_CI_CONTAINER_TAG: d7e721bceae90834dfe04e8a9ba864a55d1c49e1
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
@@ -64,9 +64,9 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_debian11_32bit: debian11-32bit
   SAMBA_CI_CONTAINER_IMAGE_debian12: debian12
   SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155
-  SAMBA_CI_CONTAINER_IMAGE_fedora39: fedora39
   SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
   SAMBA_CI_CONTAINER_IMAGE_centos9s: centos9s
+  SAMBA_CI_CONTAINER_IMAGE_fedora40: fedora40
 
 include:
   # The image creation details are specified in a separate file
@@ -268,13 +268,13 @@ samba-def-build:
 samba-mit-build:
   extends: .shared_template_build_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
   needs:
     - job: samba-mit-build
       artifacts: true
@@ -322,7 +322,7 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
 
 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_fedora39}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
 
 samba-codecheck:
   extends: .shared_template
@@ -673,10 +673,10 @@ centos9s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos9s}
 
-fedora39-samba-o3:
+fedora40-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40}
 
 #
 # Keep the samba-o3 sections at the end ...

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

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 56d1d3d4bdeccce69a96d29d30498fdce16a12e3..178c9029098a5e7f2708e656a6d21a710219e307 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -544,9 +544,9 @@ RPM_DISTS = {
             'curl': '',  # Use installed curl-minimal
         }
     },
-    'fedora39': {
-        'docker_image': 'quay.io/fedora/fedora:39',
-        'vagrant_box': 'fedora/39-cloud-base',
+    'fedora40': {
+        'docker_image': 'quay.io/fedora/fedora:40',
+        'vagrant_box': 'fedora/40-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index d9b28d9dcfd88f2a7598c109d5a6cc89bcfe04ef..79ccea780be73252bae08974007709ef18acb0ff 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -52,11 +52,11 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian12-32bit/locale.sh"
     end
 
-    config.vm.define "fedora39" do |v|
-        v.vm.box = "fedora/39-cloud-base"
-        v.vm.hostname = "fedora39"
-        v.vm.provision :shell, path: "fedora39/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora39/locale.sh"
+    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"
     end
 
     config.vm.define "opensuse155" do |v|

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

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

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

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

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 6482772ca4acf0b51aaafe35320c57835574aa22..bb0632e540d6eecdec76110ed9f71b84696031ba 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-3e791f1081a27f9462da4db20f186c9eaf592500
+d7e721bceae90834dfe04e8a9ba864a55d1c49e1