]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
bootstrap: Update Fedora to version 43
authorAndreas Schneider <asn@samba.org>
Thu, 30 Oct 2025 15:24:10 +0000 (16:24 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 9 Dec 2025 13:58:12 +0000 (13:58 +0000)
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): Tue Dec  9 13:58:12 UTC 2025 on atb-devel-224

.gitlab-ci-main.yml
bootstrap/.gitlab-ci.yml
bootstrap/config.py
bootstrap/generated-dists/Vagrantfile
bootstrap/generated-dists/fedora43/Dockerfile [moved from bootstrap/generated-dists/fedora42/Dockerfile with 96% similarity]
bootstrap/generated-dists/fedora43/bootstrap.sh [moved from bootstrap/generated-dists/fedora42/bootstrap.sh with 100% similarity]
bootstrap/generated-dists/fedora43/locale.sh [moved from bootstrap/generated-dists/fedora42/locale.sh with 100% similarity]
bootstrap/generated-dists/fedora43/packages.yml [moved from bootstrap/generated-dists/fedora42/packages.yml with 100% similarity]
bootstrap/sha1sum.txt

index 9934d005e815b2b795475c1b7ad95980308b22bb..c66b343fcad24f7847d736150618386254582f59 100644 (file)
@@ -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: 10d513aa79bd89a7884621fe3db3f77fffcb6217
+  SAMBA_CI_CONTAINER_TAG: 336927a79f09b3eb729c64872bf4eca3e2f6761f
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
@@ -67,7 +67,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155
   SAMBA_CI_CONTAINER_IMAGE_rocky8: rocky8
   SAMBA_CI_CONTAINER_IMAGE_centos9s: centos9s
-  SAMBA_CI_CONTAINER_IMAGE_fedora42: fedora42
+  SAMBA_CI_CONTAINER_IMAGE_fedora43: fedora43
 
 include:
   # The image creation details are specified in a separate file
@@ -269,13 +269,13 @@ samba-def-build:
 samba-mit-build:
   extends: .shared_template_build_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora43}
   stage: build_first
 
 .needs_samba-mit-build:
   extends: .shared_template_test_only
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora43}
   needs:
     - job: samba-mit-build
       artifacts: true
@@ -323,7 +323,7 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora43}
 
 samba-minimal-smbd:
   extends: .shared_template
@@ -395,7 +395,7 @@ samba-addc-mit-4b:
 samba-fips:
   extends: .shared_template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora43}
 
 samba-codecheck:
   extends: .shared_template
@@ -681,10 +681,10 @@ centos9s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos9s}
 
-fedora42-samba-o3:
+fedora43-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora42}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora43}
 
 #
 # Keep the samba-o3 sections at the end ...
index 11b973d9112cf07152796b3f04cee3b0c2091b16..cc8ef99b140c97b16a37ea2dcb0140a862208528 100644 (file)
@@ -102,7 +102,7 @@ debian11:
 debian12:
   extends: .build_image_template
 
-fedora42:
+fedora43:
   extends: .build_image_template
 
 debian11-32bit:
index 29a3f322f59c6253634d2989b380bfdf81ed9165..08d60dcc45b2aea3da6d4d6720478fa28a99e819 100644 (file)
@@ -554,9 +554,9 @@ RPM_DISTS = {
             'python3-varlink': '', # not available
         }
     },
-    'fedora42': {
-        'docker_image': 'quay.io/fedora/fedora-minimal:42',
-        'vagrant_box': 'fedora/42-cloud-base',
+    'fedora43': {
+        'docker_image': 'quay.io/fedora/fedora-minimal:43',
+        'vagrant_box': 'fedora/43-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
index 511c670a7987649db0f08eb376a909219d58ede5..b107d6b2bd4e7f58c71822a1db768181453a1e12 100644 (file)
@@ -45,11 +45,11 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian12-32bit/locale.sh"
     end
 
-    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"
+    config.vm.define "fedora43" do |v|
+        v.vm.box = "fedora/43-cloud-base"
+        v.vm.hostname = "fedora43"
+        v.vm.provision :shell, path: "fedora43/bootstrap.sh"
+        v.vm.provision :shell, path: "fedora43/locale.sh"
     end
 
     config.vm.define "opensuse155" do |v|
similarity index 96%
rename from bootstrap/generated-dists/fedora42/Dockerfile
rename to bootstrap/generated-dists/fedora43/Dockerfile
index 18a077761863f4d66651ab9bb937edcc46f8ae46..43b146b694981e03894ae0dc50a5af90eb6b6802 100644 (file)
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM quay.io/fedora/fedora-minimal:42
+FROM quay.io/fedora/fedora-minimal:43
 
 # pass in with --build-arg while build
 ARG SHA1SUM
index fa35a9baedb84897185d19a654765ef992af0f85..a69db3e76599448d516271007caacbe0771cabf0 100644 (file)
@@ -1 +1 @@
-10d513aa79bd89a7884621fe3db3f77fffcb6217
+336927a79f09b3eb729c64872bf4eca3e2f6761f