The branch, master has been updated via ebaafb2375c gitlab-ci: Update Fedora to version 37 from 7cb50405515 nsswitch: Fix pam_set_data()/pam_get_data() to use pointers to a time_t, not try and embedd it directly.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ebaafb2375c3866d6ba1e178a2e2f5623f6212c8 Author: Andreas Schneider <a...@samba.org> Date: Wed Nov 16 09:37:16 2022 +0100 gitlab-ci: Update Fedora to version 37 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Alexander Bokovoy <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Wed Nov 16 16:29:30 UTC 2022 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 24 +++++++++++----------- bootstrap/.gitlab-ci.yml | 6 +++--- bootstrap/config.py | 12 +++++------ bootstrap/generated-dists/Vagrantfile | 20 +++++++++--------- .../{fedora36 => f37mit120}/Dockerfile | 2 +- .../{f36mit120 => f37mit120}/bootstrap.sh | 0 .../{f36mit120 => f37mit120}/locale.sh | 0 .../{f36mit120 => f37mit120}/packages.yml | 0 .../{f36mit120 => fedora37}/Dockerfile | 2 +- .../{fedora36 => fedora37}/bootstrap.sh | 0 .../{fedora36 => fedora37}/locale.sh | 0 .../{fedora36 => fedora37}/packages.yml | 0 bootstrap/sha1sum.txt | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) rename bootstrap/generated-dists/{fedora36 => f37mit120}/Dockerfile (92%) rename bootstrap/generated-dists/{f36mit120 => f37mit120}/bootstrap.sh (100%) rename bootstrap/generated-dists/{f36mit120 => f37mit120}/locale.sh (100%) rename bootstrap/generated-dists/{f36mit120 => f37mit120}/packages.yml (100%) rename bootstrap/generated-dists/{f36mit120 => fedora37}/Dockerfile (92%) rename bootstrap/generated-dists/{fedora36 => fedora37}/bootstrap.sh (100%) rename bootstrap/generated-dists/{fedora36 => fedora37}/locale.sh (100%) rename bootstrap/generated-dists/{fedora36 => fedora37}/packages.yml (100%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 314d5210ca6..f1f9908dc55 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: afb5d32dfeebf0f100bdf9073f0c802d051ec15e + SAMBA_CI_CONTAINER_TAG: e3639b136a9b626936e849fb2976ebeed7e4fd3b # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -62,8 +62,8 @@ variables: SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154 - SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36 - SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120 + SAMBA_CI_CONTAINER_IMAGE_fedora37: fedora37 + SAMBA_CI_CONTAINER_IMAGE_f37mit120: f37mit120 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s @@ -261,20 +261,20 @@ samba-def-build: samba-mit-build: extends: .shared_template_build_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} stage: build_first samba-mit120-build: extends: .shared_template_build_only variables: AUTOBUILD_JOB_NAME: samba-mit-build - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120} stage: build_first .needs_samba-mit-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} needs: - job: samba-mit-build artifacts: true @@ -283,7 +283,7 @@ samba-mit120-build: .needs_samba-mit120-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f36mit120} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120} needs: - job: samba-mit120-build artifacts: true @@ -330,7 +330,7 @@ samba: samba-mitkrb5: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} samba-minimal-smbd: extends: .shared_template @@ -399,13 +399,13 @@ samba-addc-mit-4b: samba-fips: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} samba-shellcheck: extends: .shared_template needs: variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} stage: build_first .private_test_only: @@ -648,10 +648,10 @@ centos8s-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} -fedora36-samba-o3: +fedora37-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora36} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} # # Keep the samba-o3 sections at the end ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index a9777348334..dff5cd2bf94 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -1,4 +1,4 @@ - +--- .build_image_template: image: quay.io/podman/stable:latest stage: images @@ -97,10 +97,10 @@ ubuntu2004: debian11: extends: .build_image_template -fedora36: +fedora37: extends: .build_image_template -f36mit120: +f37mit120: extends: .build_image_template centos8s: diff --git a/bootstrap/config.py b/bootstrap/config.py index 9546db1fb28..048f256ef2e 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -495,9 +495,9 @@ RPM_DISTS = { 'shfmt': '', } }, - 'fedora36': { - 'docker_image': 'quay.io/fedora/fedora:36', - 'vagrant_box': 'fedora/36-cloud-base', + 'fedora37': { + 'docker_image': 'quay.io/fedora/fedora:37', + 'vagrant_box': 'fedora/37-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', @@ -506,9 +506,9 @@ RPM_DISTS = { 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, - 'f36mit120': { - 'docker_image': 'quay.io/fedora/fedora:36', - 'vagrant_box': 'fedora/36-cloud-base', + 'f37mit120': { + 'docker_image': 'quay.io/fedora/fedora:37', + 'vagrant_box': 'fedora/37-cloud-base', 'bootstrap': DNF_BOOTSTRAP_MIT, 'replace': { 'lsb-release': 'redhat-lsb', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 28f8f89b7d9..dad82c1e502 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,18 +31,18 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian11/locale.sh" end - config.vm.define "f36mit120" do |v| - v.vm.box = "fedora/36-cloud-base" - v.vm.hostname = "f36mit120" - v.vm.provision :shell, path: "f36mit120/bootstrap.sh" - v.vm.provision :shell, path: "f36mit120/locale.sh" + config.vm.define "f37mit120" do |v| + v.vm.box = "fedora/37-cloud-base" + v.vm.hostname = "f37mit120" + v.vm.provision :shell, path: "f37mit120/bootstrap.sh" + v.vm.provision :shell, path: "f37mit120/locale.sh" end - config.vm.define "fedora36" do |v| - v.vm.box = "fedora/36-cloud-base" - v.vm.hostname = "fedora36" - v.vm.provision :shell, path: "fedora36/bootstrap.sh" - v.vm.provision :shell, path: "fedora36/locale.sh" + config.vm.define "fedora37" do |v| + v.vm.box = "fedora/37-cloud-base" + v.vm.hostname = "fedora37" + v.vm.provision :shell, path: "fedora37/bootstrap.sh" + v.vm.provision :shell, path: "fedora37/locale.sh" end config.vm.define "opensuse154" do |v| diff --git a/bootstrap/generated-dists/fedora36/Dockerfile b/bootstrap/generated-dists/f37mit120/Dockerfile similarity index 92% rename from bootstrap/generated-dists/fedora36/Dockerfile rename to bootstrap/generated-dists/f37mit120/Dockerfile index 8ceb585b6fd..6e4c2cfd8fb 100644 --- a/bootstrap/generated-dists/fedora36/Dockerfile +++ b/bootstrap/generated-dists/f37mit120/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:36 +FROM quay.io/fedora/fedora:37 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f37mit120/bootstrap.sh similarity index 100% rename from bootstrap/generated-dists/f36mit120/bootstrap.sh rename to bootstrap/generated-dists/f37mit120/bootstrap.sh diff --git a/bootstrap/generated-dists/f36mit120/locale.sh b/bootstrap/generated-dists/f37mit120/locale.sh similarity index 100% rename from bootstrap/generated-dists/f36mit120/locale.sh rename to bootstrap/generated-dists/f37mit120/locale.sh diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f37mit120/packages.yml similarity index 100% rename from bootstrap/generated-dists/f36mit120/packages.yml rename to bootstrap/generated-dists/f37mit120/packages.yml diff --git a/bootstrap/generated-dists/f36mit120/Dockerfile b/bootstrap/generated-dists/fedora37/Dockerfile similarity index 92% rename from bootstrap/generated-dists/f36mit120/Dockerfile rename to bootstrap/generated-dists/fedora37/Dockerfile index 8ceb585b6fd..6e4c2cfd8fb 100644 --- a/bootstrap/generated-dists/f36mit120/Dockerfile +++ b/bootstrap/generated-dists/fedora37/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:36 +FROM quay.io/fedora/fedora:37 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora37/bootstrap.sh similarity index 100% rename from bootstrap/generated-dists/fedora36/bootstrap.sh rename to bootstrap/generated-dists/fedora37/bootstrap.sh diff --git a/bootstrap/generated-dists/fedora36/locale.sh b/bootstrap/generated-dists/fedora37/locale.sh similarity index 100% rename from bootstrap/generated-dists/fedora36/locale.sh rename to bootstrap/generated-dists/fedora37/locale.sh diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora37/packages.yml similarity index 100% rename from bootstrap/generated-dists/fedora36/packages.yml rename to bootstrap/generated-dists/fedora37/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index b87fad087bb..9d2e589a876 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -afb5d32dfeebf0f100bdf9073f0c802d051ec15e +e3639b136a9b626936e849fb2976ebeed7e4fd3b -- Samba Shared Repository