From 34d80fc96fe48c74631978b29e712fc826385fca Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 8 Nov 2023 13:12:21 +0100 Subject: [PATCH] gitlab-ci: Update Fedora to version 39 Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Nov 20 16:38:20 UTC 2023 on atb-devel-224 --- .gitlab-ci-main.yml | 16 ++++++++-------- bootstrap/.gitlab-ci.yml | 2 +- bootstrap/config.py | 6 +++--- bootstrap/generated-dists/Vagrantfile | 10 +++++----- .../{fedora38 => fedora39}/Dockerfile | 2 +- .../{fedora38 => fedora39}/bootstrap.sh | 0 .../{fedora38 => fedora39}/locale.sh | 0 .../{fedora38 => fedora39}/packages.yml | 0 bootstrap/sha1sum.txt | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename bootstrap/generated-dists/{fedora38 => fedora39}/Dockerfile (97%) rename bootstrap/generated-dists/{fedora38 => fedora39}/bootstrap.sh (100%) rename bootstrap/generated-dists/{fedora38 => fedora39}/locale.sh (100%) rename bootstrap/generated-dists/{fedora38 => fedora39}/packages.yml (100%) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 6614ef74e64..add5f323ec4 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: 07a822597b5bce4af9e8e2987856b27eb20bd1b7 + SAMBA_CI_CONTAINER_TAG: 9a406973474a7903fe7fd6215226660911ed73c0 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 @@ -64,7 +64,7 @@ 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_fedora38: fedora38 + SAMBA_CI_CONTAINER_IMAGE_fedora39: fedora39 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s @@ -262,13 +262,13 @@ samba-def-build: samba-mit-build: extends: .shared_template_build_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} stage: build_first .needs_samba-mit-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} needs: - job: samba-mit-build artifacts: true @@ -316,7 +316,7 @@ samba: samba-mitkrb5: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} samba-minimal-smbd: extends: .shared_template @@ -386,7 +386,7 @@ samba-addc-mit-4b: samba-fips: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} samba-codecheck: extends: .shared_template @@ -671,10 +671,10 @@ centos8s-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} -fedora38-samba-o3: +fedora39-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} # # Keep the samba-o3 sections at the end ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 71c68d9ee14..ba82cdc1251 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -100,7 +100,7 @@ debian11: debian12: extends: .build_image_template -fedora38: +fedora39: extends: .build_image_template debian11-32bit: diff --git a/bootstrap/config.py b/bootstrap/config.py index cfee5e049ce..11d8314aefc 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -541,9 +541,9 @@ RPM_DISTS = { 'codespell': '', } }, - 'fedora38': { - 'docker_image': 'quay.io/fedora/fedora:38', - 'vagrant_box': 'fedora/38-cloud-base', + 'fedora39': { + 'docker_image': 'quay.io/fedora/fedora:39', + 'vagrant_box': 'fedora/39-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index e1325695584..2c6468d768b 100644 --- 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 "fedora38" do |v| - v.vm.box = "fedora/38-cloud-base" - v.vm.hostname = "fedora38" - v.vm.provision :shell, path: "fedora38/bootstrap.sh" - v.vm.provision :shell, path: "fedora38/locale.sh" + 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" end config.vm.define "opensuse155" do |v| diff --git a/bootstrap/generated-dists/fedora38/Dockerfile b/bootstrap/generated-dists/fedora39/Dockerfile similarity index 97% rename from bootstrap/generated-dists/fedora38/Dockerfile rename to bootstrap/generated-dists/fedora39/Dockerfile index 56426229c2b..144dc8e71c2 100644 --- a/bootstrap/generated-dists/fedora38/Dockerfile +++ b/bootstrap/generated-dists/fedora39/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:38 +FROM quay.io/fedora/fedora:39 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora38/bootstrap.sh b/bootstrap/generated-dists/fedora39/bootstrap.sh similarity index 100% rename from bootstrap/generated-dists/fedora38/bootstrap.sh rename to bootstrap/generated-dists/fedora39/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora38/locale.sh b/bootstrap/generated-dists/fedora39/locale.sh similarity index 100% rename from bootstrap/generated-dists/fedora38/locale.sh rename to bootstrap/generated-dists/fedora39/locale.sh diff --git a/bootstrap/generated-dists/fedora38/packages.yml b/bootstrap/generated-dists/fedora39/packages.yml similarity index 100% rename from bootstrap/generated-dists/fedora38/packages.yml rename to bootstrap/generated-dists/fedora39/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 9d2acc49de9..61ecaf0ccf6 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -07a822597b5bce4af9e8e2987856b27eb20bd1b7 +9a406973474a7903fe7fd6215226660911ed73c0 -- 2.47.3