The branch, master has been updated via c901adaa0d4 bootstrap: Add Debian 11 from 9d3a6919202 tests/krb5: Add tests for requesting a service ticket without a PAC
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c901adaa0d4526deff550806e49976d686122674 Author: Martin Schwenke <mar...@meltin.net> Date: Thu Oct 14 14:50:41 2021 +1100 bootstrap: Add Debian 11 BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872 Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Mon Oct 18 17:19:17 UTC 2021 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 8 +++++++- bootstrap/.gitlab-ci.yml | 3 +++ bootstrap/config.py | 8 ++++++++ bootstrap/generated-dists/Vagrantfile | 7 +++++++ bootstrap/generated-dists/{centos7 => debian11}/Dockerfile | 2 +- bootstrap/generated-dists/{debian10 => debian11}/bootstrap.sh | 0 bootstrap/generated-dists/{centos7 => debian11}/locale.sh | 0 bootstrap/generated-dists/{debian10 => debian11}/packages.yml | 0 bootstrap/sha1sum.txt | 2 +- 9 files changed, 27 insertions(+), 3 deletions(-) copy bootstrap/generated-dists/{centos7 => debian11}/Dockerfile (92%) copy bootstrap/generated-dists/{debian10 => debian11}/bootstrap.sh (100%) copy bootstrap/generated-dists/{centos7 => debian11}/locale.sh (100%) copy bootstrap/generated-dists/{debian10 => debian11}/packages.yml (100%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index f807eef41ce..ba8de6c22fe 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 752c448d3186fe93a0c4039b8fbe897bb67a1f33 + SAMBA_CI_CONTAINER_TAG: 8d90789fe49d9003a7e5c66b1a00639bcce1238f # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -58,6 +58,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004 SAMBA_CI_CONTAINER_IMAGE_debian9: debian9 SAMBA_CI_CONTAINER_IMAGE_debian10: debian10 + SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151 SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152 SAMBA_CI_CONTAINER_IMAGE_fedora33: fedora33 @@ -569,6 +570,11 @@ debian10-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian10} +debian11-samba-o3: + extends: .samba-o3-template + variables: + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11} + opensuse151-samba-o3: extends: .samba-o3-template variables: diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 1cef89374de..01da6106b53 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -97,6 +97,9 @@ ubuntu2004: debian10: extends: .build_image_template +debian11: + extends: .build_image_template + fedora33: extends: .build_image_template diff --git a/bootstrap/config.py b/bootstrap/config.py index 7fe3bbd956a..c98ece513ec 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -399,6 +399,14 @@ DEB_DISTS = { 'liburing-dev': '', # not available } }, + 'debian11': { + 'docker_image': 'debian:11', + 'vagrant_box': 'debian/bullseye64', + 'replace': { + 'language-pack-en': '', # included in locales + 'liburing-dev': '', # not available + } + }, 'ubuntu1804': { 'docker_image': 'ubuntu:18.04', 'vagrant_box': 'ubuntu/bionic64', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 7c1e0d80c6a..358d8e23d59 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,6 +31,13 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian10/locale.sh" end + config.vm.define "debian11" do |v| + v.vm.box = "debian/bullseye64" + v.vm.hostname = "debian11" + v.vm.provision :shell, path: "debian11/bootstrap.sh" + v.vm.provision :shell, path: "debian11/locale.sh" + end + config.vm.define "fedora33" do |v| v.vm.box = "fedora/33-cloud-base" v.vm.hostname = "fedora33" diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/debian11/Dockerfile similarity index 92% copy from bootstrap/generated-dists/centos7/Dockerfile copy to bootstrap/generated-dists/debian11/Dockerfile index 2f171ad1c62..6a16324f201 100644 --- a/bootstrap/generated-dists/centos7/Dockerfile +++ b/bootstrap/generated-dists/debian11/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM centos:7 +FROM debian:11 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh similarity index 100% copy from bootstrap/generated-dists/debian10/bootstrap.sh copy to bootstrap/generated-dists/debian11/bootstrap.sh diff --git a/bootstrap/generated-dists/centos7/locale.sh b/bootstrap/generated-dists/debian11/locale.sh similarity index 100% copy from bootstrap/generated-dists/centos7/locale.sh copy to bootstrap/generated-dists/debian11/locale.sh diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian11/packages.yml similarity index 100% copy from bootstrap/generated-dists/debian10/packages.yml copy to bootstrap/generated-dists/debian11/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index d417a38df9a..a9996ecf27d 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -752c448d3186fe93a0c4039b8fbe897bb67a1f33 +8d90789fe49d9003a7e5c66b1a00639bcce1238f -- Samba Shared Repository