The branch, master has been updated via 7b6cedf5385 .gitlab-ci:bootstrap: remove ubuntu1804*, add debian12, upgrade opensuse 15.5 from d720eb2c083 third_party: Update socket_wrapper to version 1.4.2
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7b6cedf5385e0313acc8629c8c9238309fab64c0 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Nov 17 16:14:27 2022 +0100 .gitlab-ci:bootstrap: remove ubuntu1804*, add debian12, upgrade opensuse 15.5 Signed-off-by: Stefan Metzmacher <me...@samba.org> [abart...@samba.org Use Debian 11 for the 32 bit host as the compile currently fails - just exits without information - mid-way on Debian 12] Signed-off-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Fri Jun 30 08:51:17 UTC 2023 on atb-devel-224 ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 34 +++--- bootstrap/.gitlab-ci.yml | 18 +-- bootstrap/config.py | 30 ++++- bootstrap/generated-dists/Vagrantfile | 31 ++++- .../{centos7 => debian11-32bit}/Dockerfile | 2 +- .../{debian11 => debian11-32bit}/bootstrap.sh | 0 .../{f37mit120 => debian11-32bit}/locale.sh | 0 .../{debian11 => debian11-32bit}/packages.yml | 0 .../{centos7 => debian12-32bit}/Dockerfile | 2 +- .../{ubuntu2204 => debian12-32bit}/bootstrap.sh | 1 - .../{fedora37 => debian12-32bit}/locale.sh | 0 .../{ubuntu2204 => debian12-32bit}/packages.yml | 1 - .../{fedora37 => debian12}/Dockerfile | 4 +- .../{ubuntu2204 => debian12}/bootstrap.sh | 1 - .../{opensuse154 => debian12}/locale.sh | 0 .../{ubuntu2204 => debian12}/packages.yml | 1 - bootstrap/generated-dists/f37mit120/bootstrap.sh | 126 --------------------- bootstrap/generated-dists/f37mit120/packages.yml | 110 ------------------ bootstrap/generated-dists/fedora37/bootstrap.sh | 123 -------------------- bootstrap/generated-dists/fedora37/packages.yml | 110 ------------------ bootstrap/generated-dists/opensuse154/Dockerfile | 29 ----- .../{f37mit120 => opensuse155}/Dockerfile | 4 +- .../{opensuse154 => opensuse155}/bootstrap.sh | 0 .../{centos7 => opensuse155}/locale.sh | 0 .../{opensuse154 => opensuse155}/packages.yml | 0 bootstrap/sha1sum.txt | 2 +- 26 files changed, 85 insertions(+), 544 deletions(-) copy bootstrap/generated-dists/{centos7 => debian11-32bit}/Dockerfile (90%) copy bootstrap/generated-dists/{debian11 => debian11-32bit}/bootstrap.sh (100%) rename bootstrap/generated-dists/{f37mit120 => debian11-32bit}/locale.sh (100%) copy bootstrap/generated-dists/{debian11 => debian11-32bit}/packages.yml (100%) copy bootstrap/generated-dists/{centos7 => debian12-32bit}/Dockerfile (90%) copy bootstrap/generated-dists/{ubuntu2204 => debian12-32bit}/bootstrap.sh (97%) rename bootstrap/generated-dists/{fedora37 => debian12-32bit}/locale.sh (100%) copy bootstrap/generated-dists/{ubuntu2204 => debian12-32bit}/packages.yml (97%) rename bootstrap/generated-dists/{fedora37 => debian12}/Dockerfile (92%) copy bootstrap/generated-dists/{ubuntu2204 => debian12}/bootstrap.sh (97%) rename bootstrap/generated-dists/{opensuse154 => debian12}/locale.sh (100%) copy bootstrap/generated-dists/{ubuntu2204 => debian12}/packages.yml (97%) delete mode 100755 bootstrap/generated-dists/f37mit120/bootstrap.sh delete mode 100644 bootstrap/generated-dists/f37mit120/packages.yml delete mode 100755 bootstrap/generated-dists/fedora37/bootstrap.sh delete mode 100644 bootstrap/generated-dists/fedora37/packages.yml delete mode 100644 bootstrap/generated-dists/opensuse154/Dockerfile rename bootstrap/generated-dists/{f37mit120 => opensuse155}/Dockerfile (91%) rename bootstrap/generated-dists/{opensuse154 => opensuse155}/bootstrap.sh (100%) copy bootstrap/generated-dists/{centos7 => opensuse155}/locale.sh (100%) rename bootstrap/generated-dists/{opensuse154 => opensuse155}/packages.yml (100%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 798192f9b04..779eedb8255 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: cf0a5476a4f13d449a7542d01d225dc2aef2a333 + SAMBA_CI_CONTAINER_TAG: 190a74ee9628f298961d890ba37fcc7d213daae2 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 @@ -58,12 +58,12 @@ variables: # Please see the samba-o3 sections at the end of this file! # We should run that for each available image # - SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804 - SAMBA_CI_CONTAINER_IMAGE_ubuntu1804_32bit: ubuntu1804-32bit SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004 SAMBA_CI_CONTAINER_IMAGE_ubuntu2204: ubuntu2204 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 - SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154 + 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_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s @@ -446,7 +446,7 @@ samba-fileserver-without-smb1: extends: .needs_samba-without-smb1-build-private # This is a full build without the AD DC so we test the build with MIT -# Kerberos from the default system (Ubuntu 18.04 at this stage). +# Kerberos from the default system (Ubuntu 22.04 at this stage). # Runtime behaviour checked via the ktest (static ccache and keytab) # environment samba-ktest-mit: @@ -503,7 +503,7 @@ pages: - samba-fips - samba-no-opath1 - samba-no-opath2 - - ubuntu1804-samba-o3 + - ubuntu2204-samba-o3 script: - ls -la *.info - ./configure.developer @@ -524,7 +524,7 @@ pages: coverity: extends: .shared_runner_build_image variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse155} stage: build script: - wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz @@ -553,11 +553,11 @@ coverity: paths: - cov-int/*.txt -ubuntu1804-samba-32bit: +debian11-samba-32bit: extends: .shared_template variables: AUTOBUILD_JOB_NAME: samba-32bit - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804_32bit} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11_32bit} # # We build samba-o3 on all supported distributions @@ -571,11 +571,11 @@ ubuntu1804-samba-32bit: # when -O3 gets combined with --enable-coverage in the scheduled # builds. -ubuntu1804-samba-o3: +ubuntu2204-samba-o3: extends: .shared_template variables: AUTOBUILD_JOB_NAME: samba-o3 - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2204} SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE: "--enable-coverage" rules: # See above, to avoid a duplicate CI on the MR (these rules override the others) @@ -607,20 +607,20 @@ ubuntu2004-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004} -ubuntu2204-samba-o3: +debian11-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2204} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11} -debian11-samba-o3: +debian12-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian12} -opensuse154-samba-o3: +opensuse155-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse155} centos7-samba-o3: extends: .samba-o3-template diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index ef72d1538f1..71c68d9ee14 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -88,14 +88,6 @@ # - $SAMBA_CI_REBUILD_BROKEN_IMAGES == "yes" -ubuntu1804: - extends: .build_image_template - -ubuntu1804-32bit: - extends: .build_image_template - variables: - SAMBA_CI_TEST_JOB: "samba-32bit" - ubuntu2004: extends: .build_image_template @@ -105,9 +97,17 @@ ubuntu2204: debian11: extends: .build_image_template +debian12: + extends: .build_image_template + fedora38: extends: .build_image_template +debian11-32bit: + extends: .build_image_template + variables: + SAMBA_CI_TEST_JOB: "samba-32bit" + centos8s: extends: .build_image_template @@ -119,5 +119,5 @@ centos7: # We install a compat-gnutls34 package for GnuTLS >= 3.4.7 PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig -opensuse154: +opensuse155: extends: .build_image_template diff --git a/bootstrap/config.py b/bootstrap/config.py index 17c608ca393..5daf2d3ce54 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -415,7 +415,6 @@ Vagrant.configure("2") do |config| end """ - DEB_DISTS = { 'debian11': { 'docker_image': 'debian:11', @@ -424,6 +423,29 @@ DEB_DISTS = { 'language-pack-en': '', # included in locales } }, + 'debian11-32bit': { + 'docker_image': 'registry-1.docker.io/i386/debian:11', + 'vagrant_box': 'debian/bullseye32', + 'replace': { + 'language-pack-en': '', # included in locales + } + }, + 'debian12': { + 'docker_image': 'debian:12', + 'vagrant_box': 'debian/bookworm64', + 'replace': { + 'language-pack-en': '', # included in locales + 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available + } + }, + 'debian12-32bit': { + 'docker_image': 'registry-1.docker.io/i386/debian:12', + 'vagrant_box': 'debian/bookworm32', + 'replace': { + 'language-pack-en': '', # included in locales + 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available + } + }, 'ubuntu1804': { 'docker_image': 'ubuntu:18.04', 'vagrant_box': 'ubuntu/bionic64', @@ -524,9 +546,9 @@ RPM_DISTS = { 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, - 'opensuse154': { - 'docker_image': 'opensuse/leap:15.4', - 'vagrant_box': 'opensuse/openSUSE-15.4-x86_64', + 'opensuse155': { + 'docker_image': 'opensuse/leap:15.5', + 'vagrant_box': 'opensuse/openSUSE-15.5-x86_64', 'bootstrap': ZYPPER_BOOTSTRAP, 'replace': { '@development-tools': '', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index e744511d360..e1325695584 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,6 +31,27 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian11/locale.sh" end + config.vm.define "debian11-32bit" do |v| + v.vm.box = "debian/bullseye32" + v.vm.hostname = "debian11-32bit" + v.vm.provision :shell, path: "debian11-32bit/bootstrap.sh" + v.vm.provision :shell, path: "debian11-32bit/locale.sh" + end + + config.vm.define "debian12" do |v| + v.vm.box = "debian/bookworm64" + v.vm.hostname = "debian12" + v.vm.provision :shell, path: "debian12/bootstrap.sh" + v.vm.provision :shell, path: "debian12/locale.sh" + end + + config.vm.define "debian12-32bit" do |v| + v.vm.box = "debian/bookworm32" + v.vm.hostname = "debian12-32bit" + v.vm.provision :shell, path: "debian12-32bit/bootstrap.sh" + 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" @@ -38,11 +59,11 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "fedora38/locale.sh" end - config.vm.define "opensuse154" do |v| - v.vm.box = "opensuse/openSUSE-15.4-x86_64" - v.vm.hostname = "opensuse154" - v.vm.provision :shell, path: "opensuse154/bootstrap.sh" - v.vm.provision :shell, path: "opensuse154/locale.sh" + config.vm.define "opensuse155" do |v| + v.vm.box = "opensuse/openSUSE-15.5-x86_64" + v.vm.hostname = "opensuse155" + v.vm.provision :shell, path: "opensuse155/bootstrap.sh" + v.vm.provision :shell, path: "opensuse155/locale.sh" end config.vm.define "ubuntu1804" do |v| diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/debian11-32bit/Dockerfile similarity index 90% copy from bootstrap/generated-dists/centos7/Dockerfile copy to bootstrap/generated-dists/debian11-32bit/Dockerfile index a11c4dbf169..d0133bd41c6 100644 --- a/bootstrap/generated-dists/centos7/Dockerfile +++ b/bootstrap/generated-dists/debian11-32bit/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM centos:7 +FROM registry-1.docker.io/i386/debian:11 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh similarity index 100% copy from bootstrap/generated-dists/debian11/bootstrap.sh copy to bootstrap/generated-dists/debian11-32bit/bootstrap.sh diff --git a/bootstrap/generated-dists/f37mit120/locale.sh b/bootstrap/generated-dists/debian11-32bit/locale.sh similarity index 100% rename from bootstrap/generated-dists/f37mit120/locale.sh rename to bootstrap/generated-dists/debian11-32bit/locale.sh diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml similarity index 100% copy from bootstrap/generated-dists/debian11/packages.yml copy to bootstrap/generated-dists/debian11-32bit/packages.yml diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/debian12-32bit/Dockerfile similarity index 90% copy from bootstrap/generated-dists/centos7/Dockerfile copy to bootstrap/generated-dists/debian12-32bit/Dockerfile index a11c4dbf169..fc72e143624 100644 --- a/bootstrap/generated-dists/centos7/Dockerfile +++ b/bootstrap/generated-dists/debian12-32bit/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM centos:7 +FROM registry-1.docker.io/i386/debian:12 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh similarity index 97% copy from bootstrap/generated-dists/ubuntu2204/bootstrap.sh copy to bootstrap/generated-dists/debian12-32bit/bootstrap.sh index 5375052a438..677fb9d8727 100755 --- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh +++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh @@ -40,7 +40,6 @@ apt-get -y install \ krb5-config \ krb5-kdc \ krb5-user \ - language-pack-en \ lcov \ libacl1-dev \ libarchive-dev \ diff --git a/bootstrap/generated-dists/fedora37/locale.sh b/bootstrap/generated-dists/debian12-32bit/locale.sh similarity index 100% rename from bootstrap/generated-dists/fedora37/locale.sh rename to bootstrap/generated-dists/debian12-32bit/locale.sh diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml similarity index 97% copy from bootstrap/generated-dists/ubuntu2204/packages.yml copy to bootstrap/generated-dists/debian12-32bit/packages.yml index eee8d9cdfd4..2514914d810 100644 --- a/bootstrap/generated-dists/ubuntu2204/packages.yml +++ b/bootstrap/generated-dists/debian12-32bit/packages.yml @@ -29,7 +29,6 @@ packages: - krb5-config - krb5-kdc - krb5-user - - language-pack-en - lcov - libacl1-dev - libarchive-dev diff --git a/bootstrap/generated-dists/fedora37/Dockerfile b/bootstrap/generated-dists/debian12/Dockerfile similarity index 92% rename from bootstrap/generated-dists/fedora37/Dockerfile rename to bootstrap/generated-dists/debian12/Dockerfile index 6e4c2cfd8fb..2b0e1401c73 100644 --- a/bootstrap/generated-dists/fedora37/Dockerfile +++ b/bootstrap/generated-dists/debian12/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM quay.io/fedora/fedora:37 +FROM debian:12 # pass in with --build-arg while build ARG SHA1SUM @@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \ USER samba WORKDIR /home/samba # samba tests rely on this -ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 \ No newline at end of file +ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US \ No newline at end of file diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh similarity index 97% copy from bootstrap/generated-dists/ubuntu2204/bootstrap.sh copy to bootstrap/generated-dists/debian12/bootstrap.sh index 5375052a438..677fb9d8727 100755 --- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh +++ b/bootstrap/generated-dists/debian12/bootstrap.sh @@ -40,7 +40,6 @@ apt-get -y install \ krb5-config \ krb5-kdc \ krb5-user \ - language-pack-en \ lcov \ libacl1-dev \ libarchive-dev \ diff --git a/bootstrap/generated-dists/opensuse154/locale.sh b/bootstrap/generated-dists/debian12/locale.sh similarity index 100% rename from bootstrap/generated-dists/opensuse154/locale.sh rename to bootstrap/generated-dists/debian12/locale.sh diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/debian12/packages.yml similarity index 97% copy from bootstrap/generated-dists/ubuntu2204/packages.yml copy to bootstrap/generated-dists/debian12/packages.yml index eee8d9cdfd4..2514914d810 100644 --- a/bootstrap/generated-dists/ubuntu2204/packages.yml +++ b/bootstrap/generated-dists/debian12/packages.yml @@ -29,7 +29,6 @@ packages: - krb5-config - krb5-kdc - krb5-user - - language-pack-en - lcov - libacl1-dev - libarchive-dev diff --git a/bootstrap/generated-dists/f37mit120/bootstrap.sh b/bootstrap/generated-dists/f37mit120/bootstrap.sh deleted file mode 100755 index c46dcf0d705..00000000000 --- a/bootstrap/generated-dists/f37mit120/bootstrap.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash - -# -# This file is generated by 'bootstrap/template.py --render' -# See also bootstrap/config.py -# - -set -xueo pipefail - -dnf update -y -dnf install -y dnf-plugins-core -dnf copr -y enable abbra/krb5-test -dnf update -y - -dnf install -y \ - --setopt=install_weak_deps=False \ - @development-tools \ - ShellCheck \ - acl \ - attr \ - autoconf \ - avahi-devel \ - bind-utils \ - binutils \ - bison \ - ccache \ - chrpath \ - cups-devel \ - curl \ - dbus-devel \ - docbook-dtds \ - docbook-style-xsl \ - flex \ - gawk \ - gcc \ - gdb \ - git \ - glib2-devel \ - glibc-common \ - glibc-langpack-en \ - glusterfs-api-devel \ - glusterfs-devel \ - gnutls-devel \ - gpgme-devel \ - gzip \ - hostname \ - htop \ - jansson-devel \ - jq \ - keyutils-libs-devel \ - krb5-devel \ - krb5-server \ - krb5-workstation \ - lcov \ - libacl-devel \ - libarchive-devel \ - libattr-devel \ - libblkid-devel \ - libbsd-devel \ - libcap-devel \ - libcephfs-devel \ - libicu-devel \ - libpcap-devel \ - libtasn1-devel \ - libtasn1-tools \ - libtirpc-devel \ - libunwind-devel \ - liburing-devel \ - libuuid-devel \ - libxslt \ - lmdb \ - lmdb-devel \ - make \ - mingw64-gcc \ - mold \ - ncurses-devel \ - openldap-devel \ - pam-devel \ - patch \ - perl \ - perl-Archive-Tar \ - perl-ExtUtils-MakeMaker \ - perl-JSON \ - perl-JSON-Parse \ - perl-Parse-Yapp \ - perl-Test-Base \ - perl-generators \ - perl-interpreter \ - pkgconfig \ - popt-devel \ - procps-ng \ - psmisc \ - python3 \ - python3-cryptography \ - python3-dateutil \ - python3-devel \ - python3-dns \ - python3-gpg \ - python3-libsemanage \ -- Samba Shared Repository