Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
ci/containers/ubuntu-2204.Dockerfile | 101 +++++++++++++++++++++++++++
ci/gitlab.yml | 16 +++++
ci/manifest.yml | 2 +
3 files changed, 119 insertions(+)
create mode 100644 ci/containers/ubuntu-2204.Dockerfile
diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile
new file mode 100644
index 0000000000..410932f877
--- /dev/null
+++ b/ci/containers/ubuntu-2204.Dockerfile
@@ -0,0 +1,101 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool manifest ci/manifest.yml
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
+FROM docker.io/library/ubuntu:22.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
+ augeas-lenses \
+ augeas-tools \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ clang \
+ codespell \
+ cpp \
+ diffutils \
+ dwarves \
+ ebtables \
+ flake8 \
+ gcc \
+ gettext \
+ git \
+ grep \
+ iproute2 \
+ iptables \
+ kmod \
+ libacl1-dev \
+ libapparmor-dev \
+ libattr1-dev \
+ libaudit-dev \
+ libblkid-dev \
+ libc-dev-bin \
+ libc6-dev \
+ libcap-ng-dev \
+ libcurl4-gnutls-dev \
+ libdevmapper-dev \
+ libfuse-dev \
+ libglib2.0-dev \
+ libglusterfs-dev \
+ libgnutls28-dev \
+ libiscsi-dev \
+ libnl-3-dev \
+ libnl-route-3-dev \
+ libnuma-dev \
+ libopenwsman-dev \
+ libparted-dev \
+ libpcap0.8-dev \
+ libpciaccess-dev \
+ librbd-dev \
+ libreadline-dev \
+ libsanlock-dev \
+ libsasl2-dev \
+ libselinux1-dev \
+ libssh-dev \
+ libssh2-1-dev \
+ libtirpc-dev \
+ libudev-dev \
+ libxen-dev \
+ libxml2-dev \
+ libxml2-utils \
+ libyajl-dev \
+ locales \
+ lvm2 \
+ make \
+ meson \
+ nfs-common \
+ ninja-build \
+ numad \
+ open-iscsi \
+ perl-base \
+ pkgconf \
+ policykit-1 \
+ python3 \
+ python3-docutils \
+ qemu-utils \
+ scrub \
+ sed \
+ systemtap-sdt-dev \
+ wireshark-dev \
+ xsltproc && \
+ eatmydata apt-get autoremove -y && \
+ eatmydata apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales && \
+ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index a98ceadd79..f93f6222e8 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -184,6 +184,13 @@ x86_64-ubuntu-2004-container:
NAME: ubuntu-2004
+x86_64-ubuntu-2204-container:
+ extends: .container_job
+ allow_failure: false
+ variables:
+ NAME: ubuntu-2204
+
+
# Cross container jobs
@@ -592,6 +599,15 @@ x86_64-ubuntu-2004-clang:
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+x86_64-ubuntu-2204:
+ extends: .native_build_job
+ needs:
+ - x86_64-ubuntu-2204-container
+ allow_failure: false
+ variables:
+ NAME: ubuntu-2204
+
+
# Cross build jobs
diff --git a/ci/manifest.yml b/ci/manifest.yml
index e221cd54f3..9a643be5b8 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -223,3 +223,5 @@ targets:
CC: clang
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+
+ ubuntu-2204: x86_64
--
2.35.1On 5/6/22 10:03, Andrea Bolognani wrote: > Signed-off-by: Andrea Bolognani <abologna@redhat.com> > --- > ci/containers/ubuntu-2204.Dockerfile | 101 +++++++++++++++++++++++++++ > ci/gitlab.yml | 16 +++++ > ci/manifest.yml | 2 + > 3 files changed, 119 insertions(+) > create mode 100644 ci/containers/ubuntu-2204.Dockerfile > > @@ -592,6 +599,15 @@ x86_64-ubuntu-2004-clang: > UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 > > > +x86_64-ubuntu-2204: > + extends: .native_build_job > + needs: > + - x86_64-ubuntu-2204-container > + allow_failure: false > + variables: > + NAME: ubuntu-2204 > + > + > > # Cross build jobs > > diff --git a/ci/manifest.yml b/ci/manifest.yml > index e221cd54f3..9a643be5b8 100644 > --- a/ci/manifest.yml > +++ b/ci/manifest.yml > @@ -223,3 +223,5 @@ targets: > CC: clang > MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined > UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 > + > + ubuntu-2204: x86_64 Any reason we don't want to run ASAN on new Ubuntu? Or we do that only for clang? Michal
On Fri, May 06, 2022 at 10:29:32AM +0200, Michal Prívozník wrote: > On 5/6/22 10:03, Andrea Bolognani wrote: > > Signed-off-by: Andrea Bolognani <abologna@redhat.com> > > --- > > ci/containers/ubuntu-2204.Dockerfile | 101 +++++++++++++++++++++++++++ > > ci/gitlab.yml | 16 +++++ > > ci/manifest.yml | 2 + > > 3 files changed, 119 insertions(+) > > create mode 100644 ci/containers/ubuntu-2204.Dockerfile > > > > > > @@ -592,6 +599,15 @@ x86_64-ubuntu-2004-clang: > > UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 > > > > > > +x86_64-ubuntu-2204: > > + extends: .native_build_job > > + needs: > > + - x86_64-ubuntu-2204-container > > + allow_failure: false > > + variables: > > + NAME: ubuntu-2204 > > + > > + > > > > # Cross build jobs > > > > diff --git a/ci/manifest.yml b/ci/manifest.yml > > index e221cd54f3..9a643be5b8 100644 > > --- a/ci/manifest.yml > > +++ b/ci/manifest.yml > > @@ -223,3 +223,5 @@ targets: > > CC: clang > > MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined > > UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 > > + > > + ubuntu-2204: x86_64 > > Any reason we don't want to run ASAN on new Ubuntu? Or we do that only > for clang? We only need ASAN running on one job and which one is pretty much arbitrary unless someone can point to clear benefits for one over the other wrt ASAN results. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 5/6/22 10:31, Daniel P. Berrangé wrote: > On Fri, May 06, 2022 at 10:29:32AM +0200, Michal Prívozník wrote: >> On 5/6/22 10:03, Andrea Bolognani wrote: >>> Signed-off-by: Andrea Bolognani <abologna@redhat.com> >>> --- >>> ci/containers/ubuntu-2204.Dockerfile | 101 +++++++++++++++++++++++++++ >>> ci/gitlab.yml | 16 +++++ >>> ci/manifest.yml | 2 + >>> 3 files changed, 119 insertions(+) >>> create mode 100644 ci/containers/ubuntu-2204.Dockerfile >> >> >>> >>> @@ -592,6 +599,15 @@ x86_64-ubuntu-2004-clang: >>> UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 >>> >>> >>> +x86_64-ubuntu-2204: >>> + extends: .native_build_job >>> + needs: >>> + - x86_64-ubuntu-2204-container >>> + allow_failure: false >>> + variables: >>> + NAME: ubuntu-2204 >>> + >>> + >>> >>> # Cross build jobs >>> >>> diff --git a/ci/manifest.yml b/ci/manifest.yml >>> index e221cd54f3..9a643be5b8 100644 >>> --- a/ci/manifest.yml >>> +++ b/ci/manifest.yml >>> @@ -223,3 +223,5 @@ targets: >>> CC: clang >>> MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined >>> UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 >>> + >>> + ubuntu-2204: x86_64 >> >> Any reason we don't want to run ASAN on new Ubuntu? Or we do that only >> for clang? > > We only need ASAN running on one job and which one is pretty much > arbitrary unless someone can point to clear benefits for one over > the other wrt ASAN results. Ah, good point. Let me ack the series then. Michal
On Fri, May 06, 2022 at 10:36:10AM +0200, Michal Prívozník wrote: > On 5/6/22 10:31, Daniel P. Berrangé wrote: > >>> + ubuntu-2204: x86_64 > >> > >> Any reason we don't want to run ASAN on new Ubuntu? Or we do that only > >> for clang? > > > > We only need ASAN running on one job and which one is pretty much > > arbitrary unless someone can point to clear benefits for one over > > the other wrt ASAN results. > > Ah, good point. Let me ack the series then. I guess using more recent version of the toolchain has the potential to catch more issues, so in that regard it would make sense to move those jobs from 20.04 to 22.04. I'll prepare a follow-up patch that does just that. -- Andrea Bolognani / Red Hat / Virtualization
© 2016 - 2026 Red Hat, Inc.