From nobody Tue Feb 10 22:15:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631264346; cv=none; d=zohomail.com; s=zohoarc; b=IXCCSCmF3jNSf3wOAjtLcV9JiPNrIPccoj9RGGZt+kjueYf3rWnIRpwGQenTKtTNGa14LlQkoAncmJdIO61eh7DQSn1HMKjXVKyXOPVx9ve9nZotWpnAL77he3V+1NZIxSA4fmYya+J9xa5qKz9/3E/HLEXD4Dfa2XmiN6mj+dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631264346; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vi+0fHwPao+7Ve+/EJM/JVkcYkAMv3jGiDBIlIdm9PE=; b=ZODmYIbeh3GI86KVw+H3PMUQBsU6aj1ZCRe++LvqycgDArM5oF1YbinZfRRcFnsGJwt/CRsny9tKJp0IPwdzLImO15jB89rsdJ8Gor91YY1OBgpW5HsIOQVrC2CZqTWUEosZlEeaJ/SOk7zghYISrq39sjX5qo8IaTLONyzgkO4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1631264346437234.84216209505382; Fri, 10 Sep 2021 01:59:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-1GKkEiAqNaSg_pi82vzTfg-1; Fri, 10 Sep 2021 04:57:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63B531084687; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4412618432; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 129C34EA38; Fri, 10 Sep 2021 08:56:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18A8uZFo026277 for ; Fri, 10 Sep 2021 04:56:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B9A219733; Fri, 10 Sep 2021 08:56:35 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id B72C319C79; Fri, 10 Sep 2021 08:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631264345; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Vi+0fHwPao+7Ve+/EJM/JVkcYkAMv3jGiDBIlIdm9PE=; b=PZ4ANfcETn3olhlBAFMvVwp1ZHh8dIrZBoAW0hUzhuKRP4W6hMy1Fuom+JdSu8f2nZtTqH Gwd2hHRBuP5RyXvZMmS+thmVSNeiu8jZEVNsXCivqnylIOvjZEZaoiWFaJxL/USu2EqZaL yntpJ6Kk67j6cj1V8QVJoJgqEx90GvU= X-MC-Unique: 1GKkEiAqNaSg_pi82vzTfg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] gitlab: fold sanitizer jobs into regular ubuntu jobs Date: Fri, 10 Sep 2021 09:56:22 +0100 Message-Id: <20210910085626.943674-4-berrange@redhat.com> In-Reply-To: <20210910085626.943674-1-berrange@redhat.com> References: <20210910085626.943674-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1631264348493100001 The sanitizer jobs run in ubuntu 20.04 containers and thus overlap with testing already done for the regular ubuntu 20.04 build job. Fold the sanitizer run for GCC into the regular build job and add a second ubuntu 20.04 build job for CLang sanitizers. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 53 ++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24feb48c99..567ff91c82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ stages: before_script: - *script_variables script: - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) + - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meso= n-log.txt && exit 1) - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then @@ -71,27 +71,6 @@ stages: meson test -C build --no-suite syntax-check --print-errorlogs; fi =20 -.sanitizer_build_job: - stage: builds - image: $CI_REGISTRY_IMAGE/ci-ubuntu-2004:latest - needs: - - x64-ubuntu-2004-container - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - when: on_success - cache: - paths: - - ccache/ - key: "$CI_JOB_NAME" - before_script: - - *script_variables - script: - - meson build --werror -Ddocs=3Ddisabled -Db_lundef=3Dfalse -Db_saniti= ze=3D"$SANITIZER" - - ninja -C build; - - ninja -C build test; - variables: - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 =20 # Jobs that we delegate to Cirrus CI because they require an operating # system other than Linux. These jobs will only run if the required @@ -418,6 +397,20 @@ x64-ubuntu-2004: - x64-ubuntu-2004-container variables: NAME: ubuntu-2004 + ASAN_OPTIONS: verify_asan_link_order=3D0 + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + +x64-ubuntu-2004-clang: + extends: .native_build_job + needs: + - x64-ubuntu-2004-container + variables: + NAME: ubuntu-2004 + CC: clang + MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 + =20 x64-freebsd-12-build: extends: .cirrus_build_job @@ -545,22 +538,6 @@ mingw64-fedora-rawhide: NAME: fedora-rawhide CROSS: mingw64 =20 -# Sanitizers - -sanitize-gcc: - extends: .sanitizer_build_job - variables: - ASAN_OPTIONS: verify_asan_link_order=3D0 - CC: gcc - SANITIZER: address,undefined - -sanitize-clang: - extends: .sanitizer_build_job - variables: - CC: clang - SANITIZER: address,undefined - - # This artifact published by this job is downloaded by libvirt.org to # be deployed to the web root: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?j= ob=3Dwebsite --=20 2.31.1