[libvirt PATCH 3/4] ci: move Ubuntu GCC santizers build to 20.04
Daniel P. Berrangé
berrange at redhat.com
Fri May 27 14:06:19 UTC 2022
We currently build on Ubuntu 22.04 twice, for GCC and CLang
with santizers turned on. Moving the GCC santizers build
to 20.04 lets us cull one of the 22.04 jobs
Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
ci/gitlab/builds.yml | 7 ++++---
ci/manifest.yml | 9 ++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 255d24b0e2..a1183abb8d 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -206,7 +206,10 @@ x86_64-ubuntu-2004:
optional: true
allow_failure: false
variables:
+ ASAN_OPTIONS: verify_asan_link_order=0
+ MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
NAME: ubuntu-2004
+ UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
x86_64-ubuntu-2204:
@@ -216,10 +219,8 @@ x86_64-ubuntu-2204:
optional: true
allow_failure: false
variables:
- ASAN_OPTIONS: verify_asan_link_order=0
- MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+ LIBVIRT_JOB_OPTIONAL: 1
NAME: ubuntu-2204
- UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
x86_64-ubuntu-2204-clang:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index a825333048..97de2d7822 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -209,9 +209,7 @@ targets:
PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
- ubuntu-2004: x86_64
-
- ubuntu-2204:
+ ubuntu-2004:
jobs:
- arch: x86_64
variables:
@@ -219,6 +217,11 @@ targets:
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+ ubuntu-2204:
+ jobs:
+ - arch: x86_64
+ builds: false
+
- arch: x86_64
suffix: -clang
variables:
--
2.36.1
More information about the libvir-list
mailing list