The branch, master has been updated via 7105554cb05 bootstrap: Update to Ubuntu 22.04 as base default OS from 25aa870fed5 third_party: Update uid_wrapper to version 1.3.0
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7105554cb05224373c296f8063498c9366b7f285 Author: Stefan Metzmacher <me...@samba.org> Date: Wed Nov 2 16:56:31 2022 +0100 bootstrap: Update to Ubuntu 22.04 as base default OS We'll try to move autobuild to ubuntu 22.04 soon. Note we leave ubuntu 18.04 for the coverage and 32bit builds for now. As well as 20.04 for samba-fuzz. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Wed Jan 18 14:17:23 UTC 2023 on atb-devel-224 ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 15 +++++++++++---- bootstrap/.gitlab-ci.yml | 3 +++ bootstrap/config.py | 7 +++++++ bootstrap/generated-dists/Vagrantfile | 7 +++++++ .../generated-dists/{debian11 => ubuntu2204}/Dockerfile | 2 +- .../{ubuntu1804 => ubuntu2204}/bootstrap.sh | 2 +- .../generated-dists/{centos7 => ubuntu2204}/locale.sh | 0 .../{ubuntu2004 => ubuntu2204}/packages.yml | 2 +- bootstrap/sha1sum.txt | 2 +- 9 files changed, 32 insertions(+), 8 deletions(-) copy bootstrap/generated-dists/{debian11 => ubuntu2204}/Dockerfile (93%) copy bootstrap/generated-dists/{ubuntu1804 => ubuntu2204}/bootstrap.sh (97%) copy bootstrap/generated-dists/{centos7 => ubuntu2204}/locale.sh (100%) copy bootstrap/generated-dists/{ubuntu2004 => ubuntu2204}/packages.yml (97%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 8bc33ecfc4d..e725bfd0775 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -47,12 +47,12 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: ae284a5a64fcff65729bf50b5b0cfdba16afc682 + SAMBA_CI_CONTAINER_TAG: 790c229c42a67336099420d137fa9dc9974a133a # - # We use the ubuntu1804 image as default as - # it matches what we have on sn-devel-184. + # We use the ubuntu2204 image as default as + # it matches what we have on atb-devel-224 # - SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 + SAMBA_CI_CONTAINER_IMAGE: ubuntu2204 # # The following images are available # Please see the samba-o3 sections at the end of this file! @@ -61,6 +61,7 @@ variables: 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_fedora37: fedora37 @@ -375,6 +376,7 @@ samba-libs: samba-fuzz: extends: .shared_template variables: + # We match what Google is running over at oss-fuzz SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004} ctdb: @@ -631,6 +633,11 @@ ubuntu2004-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004} +ubuntu2204-samba-o3: + extends: .samba-o3-template + variables: + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2204} + debian11-samba-o3: extends: .samba-o3-template variables: diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index fee2861e6ea..be1e14b4b14 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -99,6 +99,9 @@ ubuntu1804-32bit: ubuntu2004: extends: .build_image_template +ubuntu2204: + extends: .build_image_template + debian11: extends: .build_image_template diff --git a/bootstrap/config.py b/bootstrap/config.py index bbcd45a044c..d2ad4503430 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -441,6 +441,13 @@ DEB_DISTS = { 'liburing-dev': '', # not available } }, + 'ubuntu2204': { + 'docker_image': 'ubuntu:22.04', + 'vagrant_box': 'ubuntu/jammy64', + 'replace': { + 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available + }, + } } diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 64ab54d2682..d67db745c8d 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -73,5 +73,12 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "ubuntu2004/locale.sh" end + config.vm.define "ubuntu2204" do |v| + v.vm.box = "ubuntu/jammy64" + v.vm.hostname = "ubuntu2204" + v.vm.provision :shell, path: "ubuntu2204/bootstrap.sh" + v.vm.provision :shell, path: "ubuntu2204/locale.sh" + end + end diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/ubuntu2204/Dockerfile similarity index 93% copy from bootstrap/generated-dists/debian11/Dockerfile copy to bootstrap/generated-dists/ubuntu2204/Dockerfile index b7a46ca53e5..0b332649787 100644 --- a/bootstrap/generated-dists/debian11/Dockerfile +++ b/bootstrap/generated-dists/ubuntu2204/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM debian:11 +FROM ubuntu:22.04 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh similarity index 97% copy from bootstrap/generated-dists/ubuntu1804/bootstrap.sh copy to bootstrap/generated-dists/ubuntu2204/bootstrap.sh index 56e7b805dfd..481d46c186c 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh @@ -70,8 +70,8 @@ apt-get -y install \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ - libtracker-sparql-2.0-dev \ libunwind-dev \ + liburing-dev \ lmdb-utils \ locales \ lsb-release \ diff --git a/bootstrap/generated-dists/centos7/locale.sh b/bootstrap/generated-dists/ubuntu2204/locale.sh similarity index 100% copy from bootstrap/generated-dists/centos7/locale.sh copy to bootstrap/generated-dists/ubuntu2204/locale.sh diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml similarity index 97% copy from bootstrap/generated-dists/ubuntu2004/packages.yml copy to bootstrap/generated-dists/ubuntu2204/packages.yml index b42b4d05989..91e48034a05 100644 --- a/bootstrap/generated-dists/ubuntu2004/packages.yml +++ b/bootstrap/generated-dists/ubuntu2204/packages.yml @@ -59,8 +59,8 @@ packages: - libsystemd-dev - libtasn1-bin - libtasn1-dev - - libtracker-sparql-2.0-dev - libunwind-dev + - liburing-dev - lmdb-utils - locales - lsb-release diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 1a76e376b75..733069047b7 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -ae284a5a64fcff65729bf50b5b0cfdba16afc682 +790c229c42a67336099420d137fa9dc9974a133a -- Samba Shared Repository