From: Andreas Schneider Date: Thu, 30 Oct 2025 15:24:10 +0000 (+0100) Subject: bootstrap: Update Fedora to version 43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=249e77e24d88b3c8a9f0d9ef8e139594aa841fa6;p=thirdparty%2Fsamba.git bootstrap: Update Fedora to version 43 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Tue Dec 9 13:58:12 UTC 2025 on atb-devel-224 --- diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 9934d005e81..c66b343fcad 100644 --- 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: 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 ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 11b973d9112..cc8ef99b140 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -102,7 +102,7 @@ debian11: debian12: extends: .build_image_template -fedora42: +fedora43: extends: .build_image_template debian11-32bit: diff --git a/bootstrap/config.py b/bootstrap/config.py index 29a3f322f59..08d60dcc45b 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -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', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 511c670a798..b107d6b2bd4 100644 --- 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 "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| diff --git a/bootstrap/generated-dists/fedora42/Dockerfile b/bootstrap/generated-dists/fedora43/Dockerfile similarity index 96% rename from bootstrap/generated-dists/fedora42/Dockerfile rename to bootstrap/generated-dists/fedora43/Dockerfile index 18a07776186..43b146b6949 100644 --- a/bootstrap/generated-dists/fedora42/Dockerfile +++ b/bootstrap/generated-dists/fedora43/Dockerfile @@ -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 diff --git a/bootstrap/generated-dists/fedora42/bootstrap.sh b/bootstrap/generated-dists/fedora43/bootstrap.sh similarity index 100% rename from bootstrap/generated-dists/fedora42/bootstrap.sh rename to bootstrap/generated-dists/fedora43/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora42/locale.sh b/bootstrap/generated-dists/fedora43/locale.sh similarity index 100% rename from bootstrap/generated-dists/fedora42/locale.sh rename to bootstrap/generated-dists/fedora43/locale.sh diff --git a/bootstrap/generated-dists/fedora42/packages.yml b/bootstrap/generated-dists/fedora43/packages.yml similarity index 100% rename from bootstrap/generated-dists/fedora42/packages.yml rename to bootstrap/generated-dists/fedora43/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index fa35a9baedb..a69db3e7659 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -10d513aa79bd89a7884621fe3db3f77fffcb6217 +336927a79f09b3eb729c64872bf4eca3e2f6761f