From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931166; cv=none; d=zohomail.com; s=zohoarc; b=C72vWtZTGhkxmcxkuzyfiDG5mModmXXaoBAJg/nvyzt/31sUVZwbDRpyLVqF4gamCjk+Nc5rnFGykPSuheXklgm8JalHKWKi2wWRZp0vviriBAEEUX4xi0DpkkTLhLuuE8QL+lzsiyD4ZJ/Vkijckj9/vTA2c9rbsZxthveLZCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931166; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DELOvnN/AHoawJnksvu78hBncjAAOsvkcsReQ+MXv0A=; b=KrtBs0fNItNeQW1Kcr5/7XNFD+QMqkS4We1hZqD3CfN9s5XUAEznEPJ4tGFtqly+GFobwd8R/bhpWoIQ+KFwqb3wV1WGMK0KCgCxqlKSyIcZhAdX8Hgan8P83Dmsy8gU12ZKGoVxNhKaasWP+n+sWahwoACCnnR+P8w3+/ufVQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1621931166717612.246639099394; Tue, 25 May 2021 01:26:06 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id r12so31196144wrp.1 for ; Tue, 25 May 2021 01:26:05 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id o11sm15033669wrq.93.2021.05.25.01.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DELOvnN/AHoawJnksvu78hBncjAAOsvkcsReQ+MXv0A=; b=Nsik5TZs2AaY+bTjI6Fmwmn73HxRbBhZAhP6CFLB5gYnzJDKysP1N0e9fjpxJ4iyer UkZz1TdYFwXz0yRskB+6B30WurOTxqbOfaGjrwFaBZ8RgKvus8Vsuwo/l18dY0xrN18I vzWSEqM3H3JYWC1vXGYRJRbqxppVAhT4pTwBFPpjlq5eROKvHnHlUCXZDPQwoFCHe+oi gqUFcKqwzFv22CITvDEkJOv/zMCMuD0LY69E9S+RZP3sLA8r493//dZtA2h9Qg4lfkId JM4xZLrc6z3UFtwceBeJDWAsY+b1nGKZLgEafzmiJqw4Nyn+WsTrIbSMpjYXYEY60ZKm h5uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DELOvnN/AHoawJnksvu78hBncjAAOsvkcsReQ+MXv0A=; b=UTFD4s2VaAhHyNCFIPOksgkWiSV6PzRaKdFSfNJ4q7I/YPeBf6p+Tdwpw0TrIfaYOz q0CqkI0Vo8kDBmDnnIwIpcySTGC1CEg+ZbTT+rXKZMcx2lSuK0thkaQ0jKGq1EEEUIm8 ZhtcvH/I0GcdaZ8wKtI3aT+Is43ylxrf5lE0Rff9/ctqQPpG5xOIKd93SVuflL0Je8PR qlii/izwIwPSjPdzOvmeUQjyX6s4lOw6g8ja3p5mZ13/MMdhW8da95O6r17jVvVm/7YA b34oGNSzlNym+S0NZebMGx9eSN2a8Ye6APA7lJEU/7rHnP2Sgwb9vn4fLbv6+GhJ1sAF Ce9w== X-Gm-Message-State: AOAM5316P3xIqLXkODAgNPcoWj5xDrpDpYCetdtsrzvvb0u02cCnOYBj vBNn8aqU9+CTuszlW1b99n4= X-Google-Smtp-Source: ABdhPJxizUWZ/QWRMK0hteX4XQwKJEv3SmZr+du7rxItAgGtqNFTM7tXaJ1qY+W+a5NjWfJqtjkgcQ== X-Received: by 2002:a5d:5250:: with SMTP id k16mr25898682wrc.211.1621931164601; Tue, 25 May 2021 01:26:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 1/9] gitlab-ci: Extract all default build/test jobs to buildtest.yml Date: Tue, 25 May 2021 10:25:48 +0200 Message-Id: <20210525082556.4011380-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the build/test jobs run by default on the mainstream CI into a new file (buildtest.yml). Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- .gitlab-ci.d/buildtest.yml | 736 +++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 736 +------------------------------------ 2 files changed, 737 insertions(+), 735 deletions(-) create mode 100644 .gitlab-ci.d/buildtest.yml diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml new file mode 100644 index 00000000000..f903fdea3f4 --- /dev/null +++ b/.gitlab-ci.d/buildtest.yml @@ -0,0 +1,736 @@ +include: + - local: '/.gitlab-ci.d/buildtest-template.yml' + +build-system-alpine: + extends: .native_build_job_template + needs: + - job: amd64-alpine-container + variables: + IMAGE: alpine + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + microblazeel-softmmu mips64el-softmmu + MAKE_CHECK_ARGS: check-build + CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log + artifacts: + expire_in: 2 days + paths: + - .git-submodule-status + - build + +check-system-alpine: + extends: .native_test_job_template + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check + +acceptance-system-alpine: + extends: .acceptance_test_job_template + needs: + - job: build-system-alpine + artifacts: true + variables: + IMAGE: alpine + MAKE_CHECK_ARGS: check-acceptance + +build-system-ubuntu: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + microblazeel-softmmu mips64el-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-ubuntu: + extends: .native_test_job_template + needs: + - job: build-system-ubuntu + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check + +acceptance-system-ubuntu: + extends: .acceptance_test_job_template + needs: + - job: build-system-ubuntu + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check-acceptance + +build-system-debian: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + CONFIGURE_ARGS: --enable-fdt=3Dsystem + TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu + riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-debian: + extends: .native_test_job_template + needs: + - job: build-system-debian + artifacts: true + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check + +acceptance-system-debian: + extends: .acceptance_test_job_template + needs: + - job: build-system-debian + artifacts: true + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-acceptance + +build-system-fedora: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs + --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne=3Dsystem + TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu + xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-fedora: + extends: .native_test_job_template + needs: + - job: build-system-fedora + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-system-fedora: + extends: .acceptance_test_job_template + needs: + - job: build-system-fedora + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-system-centos: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=3Dsystem + --enable-modules --enable-trace-backends=3Ddtrace + TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu + x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-centos: + extends: .native_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos8 + MAKE_CHECK_ARGS: check + +acceptance-system-centos: + extends: .acceptance_test_job_template + needs: + - job: build-system-centos + artifacts: true + variables: + IMAGE: centos8 + MAKE_CHECK_ARGS: check-acceptance + +build-system-opensuse: + extends: .native_build_job_template + needs: + job: amd64-opensuse-leap-container + variables: + IMAGE: opensuse-leap + CONFIGURE_ARGS: --enable-fdt=3Dsystem + TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu + MAKE_CHECK_ARGS: check-build + artifacts: + expire_in: 2 days + paths: + - build + +check-system-opensuse: + extends: .native_test_job_template + needs: + - job: build-system-opensuse + artifacts: true + variables: + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check + +acceptance-system-opensuse: + extends: .acceptance_test_job_template + needs: + - job: build-system-opensuse + artifacts: true + variables: + IMAGE: opensuse-leap + MAKE_CHECK_ARGS: check-acceptance + + +build-disabled: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: + --disable-attr + --disable-auth-pam + --disable-avx2 + --disable-bochs + --disable-brlapi + --disable-bzip2 + --disable-cap-ng + --disable-capstone + --disable-cloop + --disable-coroutine-pool + --disable-curl + --disable-curses + --disable-dmg + --disable-docs + --disable-gcrypt + --disable-glusterfs + --disable-gnutls + --disable-gtk + --disable-guest-agent + --disable-iconv + --disable-keyring + --disable-kvm + --disable-libiscsi + --disable-libpmem + --disable-libssh + --disable-libudev + --disable-libusb + --disable-libxml2 + --disable-linux-aio + --disable-live-block-migration + --disable-lzo + --disable-malloc-trim + --disable-mpath + --disable-nettle + --disable-numa + --disable-opengl + --disable-parallels + --disable-pie + --disable-qcow1 + --disable-qed + --disable-qom-cast-debug + --disable-rbd + --disable-rdma + --disable-replication + --disable-sdl + --disable-seccomp + --disable-slirp + --disable-smartcard + --disable-snappy + --disable-sparse + --disable-spice + --disable-strip + --disable-tpm + --disable-usb-redir + --disable-vdi + --disable-vhost-crypto + --disable-vhost-net + --disable-vhost-scsi + --disable-vhost-kernel + --disable-vhost-user + --disable-vhost-vdpa + --disable-vhost-vsock + --disable-virglrenderer + --disable-vnc + --disable-vte + --disable-vvfat + --disable-xen + --disable-zstd + TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu + s390x-softmmu i386-linux-user + MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow + +# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by +# the configure script. The container doesn't contain Xen headers so +# Xen accelerator is not detected / selected. As result it build the +# i386-softmmu and x86_64-softmmu with KVM being the single accelerator +# available. +# Also use a different coroutine implementation (which is only really of +# interest to KVM users, i.e. with TCG disabled) +build-tcg-disabled: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + script: + - mkdir build + - cd build + - ../configure --disable-tcg --audio-drv-list=3D"" --with-coroutine=3D= ucontext + || { cat config.log meson-logs/meson-log.txt && exit 1; } + - make -j"$JOBS" + - make check-unit + - make check-qapi-schema + - cd tests/qemu-iotests/ + - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033= 048 + 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 + 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 + - ./check -qcow2 028 051 056 057 058 065 068 082 085 091 095 096 102 1= 22 + 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 + 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 + 260 261 262 263 264 270 272 273 277 279 + +build-user: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system + MAKE_CHECK_ARGS: check-tcg + +build-user-static: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --static + MAKE_CHECK_ARGS: check-tcg + +# Because the hexagon cross-compiler takes so long to build we don't rely +# on the CI system to build it and hence this job has no dependency +# declared. The image is manually uploaded. +build-user-hexagon: + extends: .native_build_job_template + variables: + IMAGE: debian-hexagon-cross + TARGETS: hexagon-linux-user + CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg + MAKE_CHECK_ARGS: check-tcg + +# Only build the softmmu targets we have check-tcg tests for +build-some-softmmu: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --enable-debug + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + +# Run check-tcg against linux-user (with plugins) +# we skip sparc64-linux-user until it has been fixed somewhat +# we skip cris-linux-user as it doesn't use the common run loop +build-user-plugins: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --en= able-debug-tcg --target-list-exclude=3Dsparc64-linux-user,cris-linux-user + MAKE_CHECK_ARGS: check-tcg + timeout: 1h 30m + +build-user-centos7: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs + MAKE_CHECK_ARGS: check-tcg + +build-some-softmmu-plugins: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enab= le-debug-tcg + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + MAKE_CHECK_ARGS: check-tcg + +clang-system: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ + --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined + TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu + ppc-softmmu s390x-softmmu + MAKE_CHECK_ARGS: check-qtest check-tcg + +clang-user: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --disable-system + --target-list-exclude=3Dmicroblazeel-linux-user,aarch64_be-linux-use= r,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user + --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined + MAKE_CHECK_ARGS: check-unit check-tcg + +# Set LD_JOBS=3D1 because this requires LTO and ld consumes a large amount= of memory. +# On gitlab runners, default value sometimes end up calling 2 lds concurre= ntly and +# triggers an Out-Of-Memory error +# +# Since slirp callbacks are used in QEMU Timers, slirp needs to be compile= d together +# with QEMU and linked as a static library to avoid false positives in CFI= checks. +# This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of +# a system-wide version of the library +# +# Split in three sets of build/check/acceptance to limit the execution tim= e of each +# job +build-cfi-aarch64: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: aarch64-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-aarch64: + extends: .native_test_job_template + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-aarch64: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-aarch64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-cfi-ppc64-s390x: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: ppc64-softmmu s390x-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-ppc64-s390x: + extends: .native_test_job_template + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-ppc64-s390x: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-ppc64-s390x + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +build-cfi-x86_64: + extends: .native_build_job_template + needs: + - job: amd64-fedora-container + variables: + LD_JOBS: 1 + AR: llvm-ar + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug + --enable-safe-stack --enable-slirp=3Dgit + TARGETS: x86_64-softmmu + MAKE_CHECK_ARGS: check-build + timeout: 70m + artifacts: + expire_in: 2 days + paths: + - build + +check-cfi-x86_64: + extends: .native_test_job_template + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check + +acceptance-cfi-x86_64: + extends: .acceptance_test_job_template + needs: + - job: build-cfi-x86_64 + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + +tsan-build: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 + --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem + TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user + MAKE_CHECK_ARGS: bench V=3D1 + +# These targets are on the way out +build-deprecated: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools + MAKE_CHECK_ARGS: build-tcg + TARGETS: ppc64abi32-linux-user + artifacts: + expire_in: 2 days + paths: + - build + +# We split the check-tcg step as test failures are expected but we still +# want to catch the build breaking. +check-deprecated: + extends: .native_test_job_template + needs: + - job: build-deprecated + artifacts: true + variables: + IMAGE: debian-all-test-cross + MAKE_CHECK_ARGS: check-tcg + allow_failure: true + +# gprof/gcov are GCC features +gprof-gcov: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-gprof --enable-gcov + MAKE_CHECK_ARGS: check + TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu + timeout: 70m + after_script: + - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh + +build-oss-fuzz: + extends: .native_build_job_template + needs: + job: amd64-fedora-container + variables: + IMAGE: fedora + script: + - mkdir build-oss-fuzz + - CC=3D"clang" CXX=3D"clang++" CFLAGS=3D"-fsanitize=3Daddress" + ./scripts/oss-fuzz/build.sh + - export ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" + - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f + | grep -v slirp); do + grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || contin= ue ; + echo Testing ${fuzzer} ... ; + "${fuzzer}" -runs=3D1 -seed=3D1 || exit 1 ; + done + # Unrelated to fuzzer: run some tests with -fsanitize=3Daddress + - cd build-oss-fuzz && make check-qtest-i386 check-unit + +build-tci: + extends: .native_build_job_template + needs: + job: amd64-debian-user-cross-container + variables: + IMAGE: debian-all-test-cross + script: + - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" + - mkdir build + - cd build + - ../configure --enable-tcg-interpreter + --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '= ; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } + - make -j"$JOBS" + - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test + - for tg in $TARGETS ; do + export QTEST_QEMU_BINARY=3D"./qemu-system-${tg}" ; + ./tests/qtest/boot-serial-test || exit 1 ; + ./tests/qtest/cdrom-test || exit 1 ; + done + - QTEST_QEMU_BINARY=3D"./qemu-system-x86_64" ./tests/qtest/pxe-test + - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow + - make check-tcg + +# Alternate coroutines implementations are only really of interest to KVM = users +# However we can't test against KVM on Gitlab-CI so we can only run unit t= ests +build-coroutine-sigaltstack: + extends: .native_build_job_template + needs: + job: amd64-ubuntu2004-container + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg + --enable-trace-backends=3Dftrace + MAKE_CHECK_ARGS: check-unit + +# Most jobs test latest gcrypt or nettle builds +# +# These jobs test old gcrypt and nettle from RHEL7 +# which had some API differences. +crypto-old-nettle: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-gcrypt --enable-nettle + MAKE_CHECK_ARGS: check + +crypto-old-gcrypt: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-nettle --enable-gcrypt + MAKE_CHECK_ARGS: check + +crypto-only-gnutls: + extends: .native_build_job_template + needs: + job: amd64-centos7-container + variables: + IMAGE: centos7 + TARGETS: x86_64-softmmu x86_64-linux-user + CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls + MAKE_CHECK_ARGS: check + + +# Check our reduced build configurations +build-without-default-devices: + extends: .native_build_job_template + needs: + job: amd64-centos8-container + variables: + IMAGE: centos8 + CONFIGURE_ARGS: --without-default-devices --disable-user + +build-without-default-features: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + CONFIGURE_ARGS: --without-default-features --disable-user + --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu + MAKE_CHECK_ARGS: check-unit + +build-libvhost-user: + stage: build + image: $CI_REGISTRY_IMAGE/qemu/fedora:latest + needs: + job: amd64-fedora-container + before_script: + - dnf install -y meson ninja-build + script: + - mkdir subprojects/libvhost-user/build + - cd subprojects/libvhost-user/build + - meson + - ninja + +# No targets are built here, just tools, docs, and unit tests. This +# also feeds into the eventual documentation deployment steps later +build-tools-and-docs-debian: + extends: .native_build_job_template + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope + CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools + artifacts: + expire_in: 2 days + paths: + - build + +# Prepare for GitLab pages deployment. Anything copied into the +# "public" directory will be deployed to $USER.gitlab.io/$PROJECT +pages: + image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest + stage: test + needs: + - job: build-tools-and-docs-debian + script: + - mkdir -p public + # HTML-ised source tree + - make gtags + - htags -anT --tree-view=3Dfiletree -m qemu_init + -t "Welcome to the QEMU sourcecode" + - mv HTML public/src + # Project documentation + - make -C build install DESTDIR=3D$(pwd)/temp-install + - mv temp-install/usr/local/share/doc/qemu/* public/ + artifacts: + paths: + - public diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6fe64d890a..aea58813a25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,739 +4,5 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' - - local: '/.gitlab-ci.d/buildtest-template.yml' + - local: '/.gitlab-ci.d/buildtest.yml' - local: '/.gitlab-ci.d/static_checks.yml' - -build-system-alpine: - extends: .native_build_job_template - needs: - - job: amd64-alpine-container - variables: - IMAGE: alpine - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu - microblazeel-softmmu mips64el-softmmu - MAKE_CHECK_ARGS: check-build - CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log - artifacts: - expire_in: 2 days - paths: - - .git-submodule-status - - build - -check-system-alpine: - extends: .native_test_job_template - needs: - - job: build-system-alpine - artifacts: true - variables: - IMAGE: alpine - MAKE_CHECK_ARGS: check - -acceptance-system-alpine: - extends: .acceptance_test_job_template - needs: - - job: build-system-alpine - artifacts: true - variables: - IMAGE: alpine - MAKE_CHECK_ARGS: check-acceptance - -build-system-ubuntu: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu - microblazeel-softmmu mips64el-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-ubuntu: - extends: .native_test_job_template - needs: - - job: build-system-ubuntu - artifacts: true - variables: - IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check - -acceptance-system-ubuntu: - extends: .acceptance_test_job_template - needs: - - job: build-system-ubuntu - artifacts: true - variables: - IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check-acceptance - -build-system-debian: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --enable-fdt=3Dsystem - TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu - riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-debian: - extends: .native_test_job_template - needs: - - job: build-system-debian - artifacts: true - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check - -acceptance-system-debian: - extends: .acceptance_test_job_template - needs: - - job: build-system-debian - artifacts: true - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-acceptance - -build-system-fedora: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs - --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne=3Dsystem - TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu - xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-fedora: - extends: .native_test_job_template - needs: - - job: build-system-fedora - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-system-fedora: - extends: .acceptance_test_job_template - needs: - - job: build-system-fedora - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-system-centos: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=3Dsystem - --enable-modules --enable-trace-backends=3Ddtrace - TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu - x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-centos: - extends: .native_test_job_template - needs: - - job: build-system-centos - artifacts: true - variables: - IMAGE: centos8 - MAKE_CHECK_ARGS: check - -acceptance-system-centos: - extends: .acceptance_test_job_template - needs: - - job: build-system-centos - artifacts: true - variables: - IMAGE: centos8 - MAKE_CHECK_ARGS: check-acceptance - -build-system-opensuse: - extends: .native_build_job_template - needs: - job: amd64-opensuse-leap-container - variables: - IMAGE: opensuse-leap - CONFIGURE_ARGS: --enable-fdt=3Dsystem - TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu - MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build - -check-system-opensuse: - extends: .native_test_job_template - needs: - - job: build-system-opensuse - artifacts: true - variables: - IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check - -acceptance-system-opensuse: - extends: .acceptance_test_job_template - needs: - - job: build-system-opensuse - artifacts: true - variables: - IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check-acceptance - - -build-disabled: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: - --disable-attr - --disable-auth-pam - --disable-avx2 - --disable-bochs - --disable-brlapi - --disable-bzip2 - --disable-cap-ng - --disable-capstone - --disable-cloop - --disable-coroutine-pool - --disable-curl - --disable-curses - --disable-dmg - --disable-docs - --disable-gcrypt - --disable-glusterfs - --disable-gnutls - --disable-gtk - --disable-guest-agent - --disable-iconv - --disable-keyring - --disable-kvm - --disable-libiscsi - --disable-libpmem - --disable-libssh - --disable-libudev - --disable-libusb - --disable-libxml2 - --disable-linux-aio - --disable-live-block-migration - --disable-lzo - --disable-malloc-trim - --disable-mpath - --disable-nettle - --disable-numa - --disable-opengl - --disable-parallels - --disable-pie - --disable-qcow1 - --disable-qed - --disable-qom-cast-debug - --disable-rbd - --disable-rdma - --disable-replication - --disable-sdl - --disable-seccomp - --disable-slirp - --disable-smartcard - --disable-snappy - --disable-sparse - --disable-spice - --disable-strip - --disable-tpm - --disable-usb-redir - --disable-vdi - --disable-vhost-crypto - --disable-vhost-net - --disable-vhost-scsi - --disable-vhost-kernel - --disable-vhost-user - --disable-vhost-vdpa - --disable-vhost-vsock - --disable-virglrenderer - --disable-vnc - --disable-vte - --disable-vvfat - --disable-xen - --disable-zstd - TARGETS: arm-softmmu i386-softmmu ppc64-softmmu mips64-softmmu - s390x-softmmu i386-linux-user - MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow - -# This jobs explicitly disable TCG (--disable-tcg), KVM is detected by -# the configure script. The container doesn't contain Xen headers so -# Xen accelerator is not detected / selected. As result it build the -# i386-softmmu and x86_64-softmmu with KVM being the single accelerator -# available. -# Also use a different coroutine implementation (which is only really of -# interest to KVM users, i.e. with TCG disabled) -build-tcg-disabled: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - script: - - mkdir build - - cd build - - ../configure --disable-tcg --audio-drv-list=3D"" --with-coroutine=3D= ucontext - || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make -j"$JOBS" - - make check-unit - - make check-qapi-schema - - cd tests/qemu-iotests/ - - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033= 048 - 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 - 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 - - ./check -qcow2 028 051 056 057 058 065 068 082 085 091 095 096 102 1= 22 - 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 - 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 - 260 261 262 263 264 270 272 273 277 279 - -build-user: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system - MAKE_CHECK_ARGS: check-tcg - -build-user-static: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system --static - MAKE_CHECK_ARGS: check-tcg - -# Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has no dependency -# declared. The image is manually uploaded. -build-user-hexagon: - extends: .native_build_job_template - variables: - IMAGE: debian-hexagon-cross - TARGETS: hexagon-linux-user - CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg - MAKE_CHECK_ARGS: check-tcg - -# Only build the softmmu targets we have check-tcg tests for -build-some-softmmu: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --enable-debug - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu - MAKE_CHECK_ARGS: check-tcg - -# Run check-tcg against linux-user (with plugins) -# we skip sparc64-linux-user until it has been fixed somewhat -# we skip cris-linux-user as it doesn't use the common run loop -build-user-plugins: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --en= able-debug-tcg --target-list-exclude=3Dsparc64-linux-user,cris-linux-user - MAKE_CHECK_ARGS: check-tcg - timeout: 1h 30m - -build-user-centos7: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs - MAKE_CHECK_ARGS: check-tcg - -build-some-softmmu-plugins: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins --enab= le-debug-tcg - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu - MAKE_CHECK_ARGS: check-tcg - -clang-system: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ - --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined - TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu - ppc-softmmu s390x-softmmu - MAKE_CHECK_ARGS: check-qtest check-tcg - -clang-user: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --disable-system - --target-list-exclude=3Dmicroblazeel-linux-user,aarch64_be-linux-use= r,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user - --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined - MAKE_CHECK_ARGS: check-unit check-tcg - -# Set LD_JOBS=3D1 because this requires LTO and ld consumes a large amount= of memory. -# On gitlab runners, default value sometimes end up calling 2 lds concurre= ntly and -# triggers an Out-Of-Memory error -# -# Since slirp callbacks are used in QEMU Timers, slirp needs to be compile= d together -# with QEMU and linked as a static library to avoid false positives in CFI= checks. -# This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of -# a system-wide version of the library -# -# Split in three sets of build/check/acceptance to limit the execution tim= e of each -# job -build-cfi-aarch64: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: aarch64-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-aarch64: - extends: .native_test_job_template - needs: - - job: build-cfi-aarch64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-aarch64: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-aarch64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-cfi-ppc64-s390x: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: ppc64-softmmu s390x-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-ppc64-s390x: - extends: .native_test_job_template - needs: - - job: build-cfi-ppc64-s390x - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-ppc64-s390x: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-ppc64-s390x - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -build-cfi-x86_64: - extends: .native_build_job_template - needs: - - job: amd64-fedora-container - variables: - LD_JOBS: 1 - AR: llvm-ar - IMAGE: fedora - CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit - TARGETS: x86_64-softmmu - MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - -check-cfi-x86_64: - extends: .native_test_job_template - needs: - - job: build-cfi-x86_64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check - -acceptance-cfi-x86_64: - extends: .acceptance_test_job_template - needs: - - job: build-cfi-x86_64 - artifacts: true - variables: - IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance - -tsan-build: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 - --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem - TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=3D1 - -# These targets are on the way out -build-deprecated: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-tools - MAKE_CHECK_ARGS: build-tcg - TARGETS: ppc64abi32-linux-user - artifacts: - expire_in: 2 days - paths: - - build - -# We split the check-tcg step as test failures are expected but we still -# want to catch the build breaking. -check-deprecated: - extends: .native_test_job_template - needs: - - job: build-deprecated - artifacts: true - variables: - IMAGE: debian-all-test-cross - MAKE_CHECK_ARGS: check-tcg - allow_failure: true - -# gprof/gcov are GCC features -gprof-gcov: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-gprof --enable-gcov - MAKE_CHECK_ARGS: check - TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - timeout: 70m - after_script: - - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh - -build-oss-fuzz: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora - script: - - mkdir build-oss-fuzz - - CC=3D"clang" CXX=3D"clang++" CFLAGS=3D"-fsanitize=3Daddress" - ./scripts/oss-fuzz/build.sh - - export ASAN_OPTIONS=3D"fast_unwind_on_malloc=3D0" - - for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f - | grep -v slirp); do - grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || contin= ue ; - echo Testing ${fuzzer} ... ; - "${fuzzer}" -runs=3D1 -seed=3D1 || exit 1 ; - done - # Unrelated to fuzzer: run some tests with -fsanitize=3Daddress - - cd build-oss-fuzz && make check-qtest-i386 check-unit - -build-tci: - extends: .native_build_job_template - needs: - job: amd64-debian-user-cross-container - variables: - IMAGE: debian-all-test-cross - script: - - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" - - mkdir build - - cd build - - ../configure --enable-tcg-interpreter - --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '= ; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } - - make -j"$JOBS" - - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test - - for tg in $TARGETS ; do - export QTEST_QEMU_BINARY=3D"./qemu-system-${tg}" ; - ./tests/qtest/boot-serial-test || exit 1 ; - ./tests/qtest/cdrom-test || exit 1 ; - done - - QTEST_QEMU_BINARY=3D"./qemu-system-x86_64" ./tests/qtest/pxe-test - - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow - - make check-tcg - -# Alternate coroutines implementations are only really of interest to KVM = users -# However we can't test against KVM on Gitlab-CI so we can only run unit t= ests -build-coroutine-sigaltstack: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg - --enable-trace-backends=3Dftrace - MAKE_CHECK_ARGS: check-unit - -# Most jobs test latest gcrypt or nettle builds -# -# These jobs test old gcrypt and nettle from RHEL7 -# which had some API differences. -crypto-old-nettle: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - MAKE_CHECK_ARGS: check - -crypto-old-gcrypt: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - MAKE_CHECK_ARGS: check - -crypto-only-gnutls: - extends: .native_build_job_template - needs: - job: amd64-centos7-container - variables: - IMAGE: centos7 - TARGETS: x86_64-softmmu x86_64-linux-user - CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check - - -# Check our reduced build configurations -build-without-default-devices: - extends: .native_build_job_template - needs: - job: amd64-centos8-container - variables: - IMAGE: centos8 - CONFIGURE_ARGS: --without-default-devices --disable-user - -build-without-default-features: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - CONFIGURE_ARGS: --without-default-features --disable-user - --target-list-exclude=3Darm-softmmu,i386-softmmu,mipsel-softmmu,mi= ps64-softmmu,ppc-softmmu - MAKE_CHECK_ARGS: check-unit - -build-libvhost-user: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/fedora:latest - needs: - job: amd64-fedora-container - before_script: - - dnf install -y meson ninja-build - script: - - mkdir subprojects/libvhost-user/build - - cd subprojects/libvhost-user/build - - meson - - ninja - -# No targets are built here, just tools, docs, and unit tests. This -# also feeds into the eventual documentation deployment steps later -build-tools-and-docs-debian: - extends: .native_build_job_template - needs: - job: amd64-debian-container - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope - CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools - artifacts: - expire_in: 2 days - paths: - - build - -# Prepare for GitLab pages deployment. Anything copied into the -# "public" directory will be deployed to $USER.gitlab.io/$PROJECT -pages: - image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest - stage: test - needs: - - job: build-tools-and-docs-debian - script: - - mkdir -p public - # HTML-ised source tree - - make gtags - - htags -anT --tree-view=3Dfiletree -m qemu_init - -t "Welcome to the QEMU sourcecode" - - mv HTML public/src - # Project documentation - - make -C build install DESTDIR=3D$(pwd)/temp-install - - mv temp-install/usr/local/share/doc/qemu/* public/ - artifacts: - paths: - - public --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931170; cv=none; d=zohomail.com; s=zohoarc; b=U97Wp1gpRW1E8Fxb+41iH9s8uhylV8nl2oFTIUXtXXbswEhkNFRI7GgRp+VobUcO3NhZPwbGqwmFAfhonemrnWr2xoL32Dxr5g5acqwV3b6ABBryp5/Qdo0wywCZMtQkLVEOEoaGvkkXn5TSSxqgDfvhV7Chx31ld84+aA+C2wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931170; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k7v32F7sA+s0nX/521Wn9idR1Uq3Ai0OnDxbO/sW8qQ=; b=gTMQ3a9V7txL3zdMPPaaAPjC+SFjQ5qC4ugPdcEfwW3n/P4JDGHT7GkftaMR2BDsxzHpGYXZND9KJS8JQ7uFsHvuxWaogdrAFER7AfmCWeFFOMmYtlXH/7NvnAQZjMj5c2jOECqmg9iywHFpxbxIcue/9tUSTPV6M6tRja6i48M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1621931170943419.63425127730704; Tue, 25 May 2021 01:26:10 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id p7so27476853wru.10 for ; Tue, 25 May 2021 01:26:10 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m20sm1963910wmi.5.2021.05.25.01.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k7v32F7sA+s0nX/521Wn9idR1Uq3Ai0OnDxbO/sW8qQ=; b=LZ0N9UwmnVPeCQfxPxHp13HuxnMbWx9vJGeIOZmAIn8RLiAthXy9dGDPkJtd/CfSRy TxQ5oHSVhAfqxycYY2JGRc09X5AXmIs/s/l3Rs7x+SuT2VFbv1CPojiBtl+SQVjnl48m 2H0nLTe0uVfdFag6W4+dbCFOGIeak4a7B8gLgu+lrJKXnp++UjgPzpYFw258zanOZ5zy I3I3hh/cd0fyN7QfsE1jCaatpkxenzVcv+3gT5gmmq8CVg4ZYkaofyQKKoOTAj5EsqTT TvZkVrqamQ8DMJcpk4JdjAja/ZcB7sJeK4acvtxt01k+SkmtWT7Nix/96dVd4zYvaDZf O52w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=k7v32F7sA+s0nX/521Wn9idR1Uq3Ai0OnDxbO/sW8qQ=; b=claBbN7jjFgMPlz8Q+6z9VScpdG0S8pyAK8Tincf/wP/ItwFiYzMMaccspK+lLbzfV odcig1eIR58Y5FapbUS0A+vUksQl1kp4oBZyGTfUHVpiB8bgXY6320NMwMGQEHX+Z4+J 93gYZh9ka1PJ1uj7udAknjbMY3lVjLl9gbYjZ9Q4bfFjFmaIPgsw2sSLui2BdVUwSUPP Dqg53PtW46H/XJ3dL7spkPR0fCg4RJ+nCPXiIgLek9ZsTO8/LN9xY6n+/q8auvcxIK4a tKYECdLjxvoDqQYm9S6YWjF7eloWZGdy4wQ1zAvBGLN7t1EFdyMGKBpPMauLZBen2sqn 3bfA== X-Gm-Message-State: AOAM532LPO/cT4bxt8A+yxnsDSNTuTtxv7eo/JtMWqqg6L8/CECjHnRa AaOa/FBwr2njVdwmpa29Keg= X-Google-Smtp-Source: ABdhPJy8NWPOnWfAIu00QsiUzcjLgtIuHFCWDWPZo3ykJ8p27RXjXf6wZe+QOHlJPQc7b3j4HGqtIg== X-Received: by 2002:a5d:490d:: with SMTP id x13mr25963348wrq.49.1621931169253; Tue, 25 May 2021 01:26:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 2/9] gitlab-ci: Move current job set to qemu-project.yml Date: Tue, 25 May 2021 10:25:49 +0200 Message-Id: <20210525082556.4011380-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To allow forks to easily decide which jobs they want to run, but without disrupting the current default, move the current set of jobs to a new file corresponding to the jobs run by the mainstream project CI: https://gitlab.com/qemu-project/qemu/-/pipelines Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- .gitlab-ci.d/qemu-project.yml | 11 +++++++++++ .gitlab-ci.yml | 8 +------- 2 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .gitlab-ci.d/qemu-project.yml diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml new file mode 100644 index 00000000000..64cb2ba1da5 --- /dev/null +++ b/.gitlab-ci.d/qemu-project.yml @@ -0,0 +1,11 @@ +# This file contains the set of jobs run by the QEMU project: +# https://gitlab.com/qemu-project/qemu/-/pipelines + +include: + - local: '/.gitlab-ci.d/stages.yml' + - local: '/.gitlab-ci.d/edk2.yml' + - local: '/.gitlab-ci.d/opensbi.yml' + - local: '/.gitlab-ci.d/containers.yml' + - local: '/.gitlab-ci.d/crossbuilds.yml' + - local: '/.gitlab-ci.d/buildtest.yml' + - local: '/.gitlab-ci.d/static_checks.yml' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aea58813a25..533a7e61339 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,2 @@ include: - - local: '/.gitlab-ci.d/stages.yml' - - local: '/.gitlab-ci.d/edk2.yml' - - local: '/.gitlab-ci.d/opensbi.yml' - - local: '/.gitlab-ci.d/containers.yml' - - local: '/.gitlab-ci.d/crossbuilds.yml' - - local: '/.gitlab-ci.d/buildtest.yml' - - local: '/.gitlab-ci.d/static_checks.yml' + - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931175; cv=none; d=zohomail.com; s=zohoarc; b=Zawual5XqOJL9pt9GERKly4csfMRHV3hD/bdfjrVjcIxXFSAy9sXUcIuDSrgvIsx4HrmHhLDFPwDu03MS1GotIUU7xEJMaXqbIVGvQm7V00SRvyWQFHtJMaAjER9MAqjCkKlwmWN8mU3ZJ8gTtIF+NeU1BRpneiGEne+Yemzhi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ux6np9ztAdqQGvdxsklQqqZAAfB86o2ZJo9IT2gBAyM=; b=gaLbx+1ERS4h7AEsDYvtvmNcS41YIeNz1jusTGvdJ7UHRzMlyD6yDaWvHjJ9YgAzuktMFtCsfnp3iEDnNpotgPa2BPeNrg65K/fwHyTvgIxRDrwXTAbAr7WE2ETLmRDhsiZENcgJWJ2rICiv8RvAlREZo4yUUk9u4tXFhNc7zwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1621931175508543.6795682337457; Tue, 25 May 2021 01:26:15 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id l18-20020a1c79120000b0290181c444b2d0so5747460wme.5 for ; Tue, 25 May 2021 01:26:14 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id y22sm2265191wma.36.2021.05.25.01.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ux6np9ztAdqQGvdxsklQqqZAAfB86o2ZJo9IT2gBAyM=; b=L1bBpTctMztGCoEqU+eEqaPboM08ILeHaGUdYgVwae3ODzKh1IfRfIY5y4kfVNFNZy mkVgclxYtkDdl3BeK7n8ii56iXbOo7Xdix5Yxk+YAKHyP4TbJ1zLZXf5DcIzqZ5lq4m/ CSM1qjSmetW7mU/PP+paYZa9tR1+i8DqH/0oHD3+M8Qkw1izVKIu4Pr/1xX5HETEOkd/ 2z+S+Cy73ttOU+I6J4RbL63du6PqhybUkQCnGEXmena87yreSj0yj/vermvWD5ZkAvhI YGNB8K8aiaxwEK2xwXlSdp96VhrLz+VyOwb2QZMwKNShT1oxhTmGcHfA0pri0u8tkF3B PM8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ux6np9ztAdqQGvdxsklQqqZAAfB86o2ZJo9IT2gBAyM=; b=Dccosr3EcpnI+OtxxRK2u3gS3+OC10C9y7BBDy8TtTzlx+aJtQEevDsIhDqPSnVoFH dDT9SRFGLCPMOB0gDkE+k5pxBUXw+fe/17CiZIaPWtEfSr00VN1j+fiKUCjgXbs6gz+r hWtYgjkfX3EMiMccJ9fJg6/uCiUgyD7B536fE7fZiaIOr9rei3VvrvH3/EgJDpbEdRDI ZaVZpUPutAGs6H3qrF3digFOhBZQ6JKUJDEh+b+nWZBlFNdEDhVYZoQuX3+90SEf+gNe QZZ8C3s2JKCKF7PUwC7qdEZmzGdoeTXsVTChYxnz5O8a1cOC2Q0nQ0LZX28iG9fezn9G D0Cw== X-Gm-Message-State: AOAM531fzydikN7ikVpf9tDLdtCBuAGbIa3BIdSaHnYVRJ76sv0qUKSo P8pks4A5VIoDvwOxAthH8g8= X-Google-Smtp-Source: ABdhPJwbUhS0ZSgs26UIDzNPKWYmqLJCnhcLqqDyEILyFz9JciLmd8Liuj00/CyS1iCaWaDpsoYrxA== X-Received: by 2002:a05:600c:2dd0:: with SMTP id e16mr9147218wmh.135.1621931173831; Tue, 25 May 2021 01:26:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 3/9] gitlab-ci: Document how forks can use different set of jobs Date: Tue, 25 May 2021 10:25:50 +0200 Message-Id: <20210525082556.4011380-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Document how forks can use different set of jobs and add a big warning so no new configuration is added to this file. Suggested-by: Daniel Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 533a7e61339..8c843e5f20e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,2 +1,16 @@ +# +# This is the GitLab CI configuration file for the mainstream QEMU +# project: https://gitlab.com/qemu-project/qemu/-/pipelines +# +# !!! DO NOT ADD ANY NEW CONFIGURATION TO THIS FILE !!! +# +# Only documentation or comments is accepted. +# +# To use a different set of jobs than the mainstream QEMU project, +# you need to use the "custom CI/CD configuration path" option in +# your GitLab CI namespace setting and set it to option and set the +# location of your custom .gitlab-ci.yml: +# https://docs.gitlab.com/ee/ci/pipelines/settings.html#custom-cicd-config= uration-path +# include: - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621931180; cv=none; d=zohomail.com; s=zohoarc; b=jo6oJgoBlewkzSYBm2z8KREVgv+Tdlp2S+NhvZI6raeMqsCc+maTrWHTdThp4Pf8ZG1GFYwK9QeMWWAxn2T7RUQVp+nVM3qbeaO7+0pWvl9Bj067JpMvsgM4hSOYtfk/0Djf+KmfwqMbNeiXI0IGht/ONr509JvQbfSvhNg5N1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931180; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2LHUnVhjDAjzTzxxMMwUXEhFIuA3qKS7lsMw2CoIcy8=; b=myfI4gaP9VfWFwG9LzKW/FAKmOqiUMncuauXNrphkVfpUQwPWnH1h2jrr0hYkYr0HZUxqvXnU9l5fhHj0g2nOSNVhp4hAusozEKxLmQ6WI5UQctllqpQYo1I6C8DGW2b2/vdrUyAJmpEaiByTSnxeENGqZYCGnwDtuy6jWm8bCM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1621931180529379.72733144621463; Tue, 25 May 2021 01:26:20 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id x8so31189224wrq.9 for ; Tue, 25 May 2021 01:26:19 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id z3sm16044285wrq.42.2021.05.25.01.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2LHUnVhjDAjzTzxxMMwUXEhFIuA3qKS7lsMw2CoIcy8=; b=R8rfDRx2NUtgjXxMjg6EUuZMMi6mn3PZEdj3FVIHkHXTGauBD3eSrlJb6z8JKcykW2 sRxX2MW3V/mMLKNw42ZgtgLcYkNGWrr7yZbBIfbKCmYN0vKNozc7CDib5gAEKkMYuuWq 1/lUSklj8+OEj15ffw28iNEZbckJp/5fVLBvn3PbhV6xD1xPS9jVNobjXQKE1m+wLnUw MrufieN/Ujzu4hxB9m4OipAamvvPQkkNE3SneyMQCOnHTUHKcsEk5AtqDms0b8M6XsMj L/+f91twtmkT+QQUDdnsv+Lk0y90ZGCueUVjF5s87/Zox/sHACpQHReTdxEtq53vM7pV A7Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2LHUnVhjDAjzTzxxMMwUXEhFIuA3qKS7lsMw2CoIcy8=; b=OmUI2ctmEJLJgRupPdbP3KoWrR3mYwfFd8Afsfvusl9dXAcS6QuJyuaAEFQcd1L+Kt ZVi8tGiuI0iEClFZcndpVKvxUB89sz7pmQFjl/W6TAbXME9gWccFnR7GkgIFLiX65ucF crWZ8eFi5P8HDnikvat+my2xR3TAferJa+JnLIbGcnqD5Lj/it3boGBhXrmLyJsEyn07 V2zKoapHRznKoOnpkvzo0BsKF1omCm7jlP082JD4HASU/PEWlsG5xHMgO6MCPn5yQB5T 8VMcUReumA6vWsg44vnU+jw1U8O0g9O7ahqRegTYxKgMSlLtXKJ47XsCXdNSgPKRYYc9 9Khg== X-Gm-Message-State: AOAM533tJRdKbCXhRc38ZzBiQ3OPRYSYXM8ALu5xDEdZhe5x1IZQ3fGV UIm4YjpyB2Ygbjfgzqwycm4= X-Google-Smtp-Source: ABdhPJxSo9/BfaL8BuNZc2TiRzqVgw04SQ9s9RSyP10kSSCwfi1d1VUG+B/G/gmB5Qm+0ON3ndXJXw== X-Received: by 2002:adf:cf09:: with SMTP id o9mr26338898wrj.334.1621931178730; Tue, 25 May 2021 01:26:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 4/9] gitlab-ci: Extract cross-container jobs to container-cross.yml Date: Tue, 25 May 2021 10:25:51 +0200 Message-Id: <20210525082556.4011380-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Extract the jobs preparing the cross containers into a new file (container-cross.yml). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/container-cross.yml | 164 ++++++++++++++++++++++++++++++ .gitlab-ci.d/containers.yml | 166 +------------------------------ 2 files changed, 165 insertions(+), 165 deletions(-) create mode 100644 .gitlab-ci.d/container-cross.yml diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml new file mode 100644 index 00000000000..a8e74360888 --- /dev/null +++ b/.gitlab-ci.d/container-cross.yml @@ -0,0 +1,164 @@ +alpha-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-alpha-cross + +amd64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-amd64-cross + +amd64-debian-user-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-all-test-cross + +arm64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-arm64-cross + +arm64-test-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian11-container'] + variables: + NAME: debian-arm64-test-cross + +armel-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-armel-cross + +armhf-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-armhf-cross + +hppa-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-hppa-cross + +m68k-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-m68k-cross + +mips64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64-cross + +mips64el-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64el-cross + +mips-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips-cross + +mipsel-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mipsel-cross + +powerpc-test-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian11-container'] + variables: + NAME: debian-powerpc-test-cross + +ppc64el-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-ppc64el-cross + +riscv64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-riscv64-cross + +s390x-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-s390x-cross + +sh4-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sh4-cross + +sparc64-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sparc64-cross + +tricore-debian-cross-container: + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-tricore-cross + +xtensa-debian-cross-container: + extends: .container_job_template + variables: + NAME: debian-xtensa-cross + +cris-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-cris-cross + +i386-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-i386-cross + +win32-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + extends: .container_job_template + variables: + NAME: fedora-win64-cross diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 3f8defb5774..bd01ae8f802 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,6 @@ include: - local: '/.gitlab-ci.d/container-core.yml' + - local: '/.gitlab-ci.d/container-cross.yml' =20 amd64-alpine-container: extends: .container_job_template @@ -16,27 +17,6 @@ amd64-debian11-container: variables: NAME: debian11 =20 -alpha-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-alpha-cross - -amd64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-amd64-cross - -amd64-debian-user-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-all-test-cross - amd64-debian-container: extends: .container_job_template stage: containers-layer2 @@ -44,150 +24,6 @@ amd64-debian-container: variables: NAME: debian-amd64 =20 -arm64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-arm64-cross - -arm64-test-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-arm64-test-cross - -armel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-armel-cross - -armhf-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-armhf-cross - -hppa-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-hppa-cross - -m68k-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-m68k-cross - -mips64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64-cross - -mips64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips64el-cross - -mips-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mips-cross - -mipsel-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-mipsel-cross - -powerpc-test-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian11-container'] - variables: - NAME: debian-powerpc-test-cross - -ppc64el-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-ppc64el-cross - -riscv64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-riscv64-cross - -s390x-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-s390x-cross - -sh4-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sh4-cross - -sparc64-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-sparc64-cross - -tricore-debian-cross-container: - extends: .container_job_template - stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-tricore-cross - -xtensa-debian-cross-container: - extends: .container_job_template - variables: - NAME: debian-xtensa-cross - -cris-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-cris-cross - -i386-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-i386-cross - -win32-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win32-cross - -win64-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win64-cross - amd64-ubuntu1804-container: extends: .container_job_template variables: --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621931185; cv=none; d=zohomail.com; s=zohoarc; b=LJU2dQ1HselQv1MCG6Pjd2bO6gf56ESuzkdikFwIt3C48IFt54r4XJndzkNKeTOJzTs1evTFeP57n0JyETY4K2xq7aEp5ffAOqJlafV3sJegkO9/ggbdjL0A4qFYpuxdPrKtRTvRDdOrQMLO+ZUrXqExaSFNq4IwyYl34jUv4tA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931185; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=en2f8Kb1eqCBIkOKkRAaVLFl16HvBGjH/7Agrl93vlY=; b=lixfiK8JgauDOsVlMt1ALPiKAmd8Amm5ak7tIBjqon1HFCXNFNiodpBEaJ2CUdfw55W3i27wnpIsmuRQt+bQwA+RNcTt2zr6nIGXpJklz41leqJ+Qrq9b/m2CFZYi76w/yyb0/fK+XwqTGe8jqi0QtxyxZFW53OWuU2ud+3jW4M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1621931185273947.152202618749; Tue, 25 May 2021 01:26:25 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id x8so31189506wrq.9 for ; Tue, 25 May 2021 01:26:24 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id u126sm2309838wmb.9.2021.05.25.01.26.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=en2f8Kb1eqCBIkOKkRAaVLFl16HvBGjH/7Agrl93vlY=; b=H3cCmP6WLFXeNIp3jPJr3xrNa68zHUxQXlKpWIaDKZEkpSLP0y7g7clXrtm5hfQnr0 i+ro82SHXPMpygLFSt1xg8gyZILRdjWGpWU5UOfJjerZMcWxsWb6V0XMI3eqnpuw47U/ tVSkfAoQgGMIQnWwNyCkrRjq6MmqO23TKjIDW7A+xMuD7dgZ4ypY3dBBS2Z4tU/X6OFZ +fJpThfmPk+3lG5J/sqWlFi3nEYIrIdlf+LurYLPaFytOyKD9nBi4PrRLIXQUIaKX2mZ v5rv9/Ib72LJ/HSpseCKPMiQC7EYSPMU+mOYfDAajOiQls0M0FYRrBJll5eMW3DnJBdg Tz3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=en2f8Kb1eqCBIkOKkRAaVLFl16HvBGjH/7Agrl93vlY=; b=SHwfjzN+c/OgYTk907X6D+VRfF16h9u9/clQptbL0vBMElHOHMdh9YxmZWYts9JPj0 HGmzJBHIAZlhMpa2OqefYqA4RVy1FZilsbirYyhgDqeLeeVSqddIkkuuTM+EQ/2E3pkA diavPnoP4UZw6dyE8+HA5eLVDyeTkjBNb1cC/GHEt7nAeABAnl+IWG/aI8ylqWSivG8f HTPVceUGJ6BZgbdBMCB1BqREs3AqOkmYU25J5QuN+vZrCgWfbvNzLtaBaHuwmnpA1qC7 MXoSDCvQpqjexxXbhC92q/w9kVvd7L69gfhFgdyySpnFBvt0WTMq+2xFwg7ZNKQZtI8R di+w== X-Gm-Message-State: AOAM531wCh/dKKZtpvuljrGg5h69R54ww5LYTvxCnL60Jh5eG3MeZnR7 L2QZFsZ4q6q/d/scsFDC5nE= X-Google-Smtp-Source: ABdhPJxIQKZbhl5PAHSvtUM4Mb3q1w+C8ZyZy8Bax5pADatoPxcKYQTasD+AevE6P7e5zoFrK4Ugjg== X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr25711440wrx.385.1621931183514; Tue, 25 May 2021 01:26:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 5/9] gitlab-ci: explicitly reference the upstream registry Date: Tue, 25 May 2021 10:25:52 +0200 Message-Id: <20210525082556.4011380-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Alex Benn=C3=A9e Since c8e6793903 ("containers.yml: build with docker.py tooling") we don't need to manually pull stuff from the upstream repository. Just set the -r field to explicitly use that rather than the current registry. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org> Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [PMD: Rebased] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/container-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 9e3f3ae3c26..1baecd94606 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -12,10 +12,9 @@ script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - ./tests/docker/docker.py --engine docker build -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY_IMAGE + -r $CI_REGISTRY/qemu-project/qemu - docker tag "qemu/$NAME" "$TAG" - docker push "$TAG" after_script: --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931190; cv=none; d=zohomail.com; s=zohoarc; b=Bp2y9ZOIq7gDJLcyjG6IzFcAlBFzcMCYKcoKg5TOA+i5pX2UknX7csCYrnBU5pbmyWKAPMvKHsC5fxhnm6eX5+QRYEKGzknXQFAHl5xjLXytc7jKg3232jCfKgXIY4VQLxmS0l/CSJe49GLK/XHBONmSQQ6RDdQKYg/9CsK006E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931190; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hYe5uhovemiIm4ZvAvve+Y9rTfAkxnOn7U/FYNhXgRs=; b=iGeYXAQdwDPqv+PANYx91aVUd1FU4puT4dfqEhj+2WsIcYQHuldqb+buwL8k57Bc7NQ1F9xefcxWHt5KS3clOrHI46hMNZfpelmSS5i94XYiK0uKSa+NmdcI8qrxYsmdjPfHK/3qZH+vWg5yAqhue71Qh7du8+XCZXbSO/mjnJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1621931190165448.86829812552014; Tue, 25 May 2021 01:26:30 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id x7so11587536wrt.12 for ; Tue, 25 May 2021 01:26:29 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id n6sm9834032wmq.34.2021.05.25.01.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hYe5uhovemiIm4ZvAvve+Y9rTfAkxnOn7U/FYNhXgRs=; b=gLF2aThvBv19wEZCv77vc3adoTOaS7bs5tMMM8rOmpkcp21LvdstfUkVdxOLg6rOxW t6durv2zbZ9esQTFPAEmpUvZJwdL9xA197OGK5Fg/wpuKHW1sUkLsBhgKnL2Kx3wOvj+ sYxQScvlKPY+jlQCGOGuZKQiaJ/DAm1suPEfQPZ2SNJPMUrbePTyc5wIATTjqOqcRVwR K3FPfpAzTEQzKMYyF7okcp6Sn9Lznsyd4rlCxfkMYCS/rTiyBNYX5/jkom89oXJHyM24 4wd41vSPW4MThbth5fjF7OJfXt8gbsd4bnv++uP8wzeXWCS7dc/JNm57OqTMWlGqq5HX ukqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hYe5uhovemiIm4ZvAvve+Y9rTfAkxnOn7U/FYNhXgRs=; b=HtEW4Mxl7I9S6ZYOfLhP4c6tYVw8FT6axeAknm+bd7nbVAQ95g3PZfk1LgUmoAlm11 NvFUFTFwcys1QSPA7oNGA3oQzMvQ9IPPJUdx0F7Bjyp7g6zUkGruPF5zWhW43sMWHYLn fbWZnL6IpmS7bgW3IhNd7Ih1/FobffNNiCROADIFt7/cXxKRLBPPJidFom5cccoABaH6 4QCQwlSm3yxeWpzD+6sBYEXuAcEST2L61Ank2g1NZmxM7EN3GFgPVXmih2gotxkeYZpw mKHjvkgeQFTyMCyXCPJEBA/DjuiRvBfhOhwkww7jeHtwoTENivDDtNi80G6g9I+3DsRZ aGhw== X-Gm-Message-State: AOAM5315E6mVxTCIZtmhKc3u+FAqfhmOvLK0ZX8a0DobtaRwQx6eNUQp kcZyJlQORFwG0hIMuyLOsFQ= X-Google-Smtp-Source: ABdhPJxejsKkbHBIWgeTQMJZQgbEVR0L4rqVzNXxdk5KdKZmbEfQM9lfr88z7rXgkHpkB7iV3zGE0g== X-Received: by 2002:a05:6000:1147:: with SMTP id d7mr26548783wrx.302.1621931188464; Tue, 25 May 2021 01:26:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 6/9] gitlab-ci: Split gprof-gcov job Date: Tue, 25 May 2021 10:25:53 +0200 Message-Id: <20210525082556.4011380-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This job is hitting the 70min limit, so split it in 2 tasks. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f903fdea3f4..894732e203d 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -564,16 +564,27 @@ check-deprecated: allow_failure: true =20 # gprof/gcov are GCC features -gprof-gcov: +build-gprof-gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-gprof --enable-gcov - MAKE_CHECK_ARGS: check TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - timeout: 70m + artifacts: + expire_in: 1 days + paths: + - build + +check-gprof-gcov: + extends: .native_test_job_template + needs: + - job: build-gprof-gcov + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check after_script: - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh =20 --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931194; cv=none; d=zohomail.com; s=zohoarc; b=Va2p9BulHW4li2hOuhwXvKAmp987lViJPUw5CAlc31o9bAl3W6iqjJNoOVZeuWZBQNB426N7+hshB/UGt3gD0FbqR9LU9W4UHmc4SG37c4uF+lY7sAQWpocld+ACfbcqxUCLmY9qFsPP3xqagf2kUFh6fjZQZqfJnDhyYYPlUms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SkoozkaB7xWv3v3H2rLnYDJGNp2meEPJ8CYN/joh4jA=; b=ZvAJbcSp7vse/pdCNohosYuzTRTDMNQ1cBzPXkzhKpevO6bTq441RJWr2pz6P3st5V7+uBQC4Dn86wZJOY5RVjM7vIL/eqRdrbJHNtE4/CHcCcXhgcI/z/y3OuLy98YqRLmNKfjWw3UxKfStZ6Qf/EmeqjXILNZO6zA8MQOJmtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1621931194817121.0150486108937; Tue, 25 May 2021 01:26:34 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id d11so31180919wrw.8 for ; Tue, 25 May 2021 01:26:34 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id x10sm14968937wrt.65.2021.05.25.01.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SkoozkaB7xWv3v3H2rLnYDJGNp2meEPJ8CYN/joh4jA=; b=lkxZ0X2xkSGD9JUTXHKzB2ZqbPUm8jPdv1d22wOSkwk1vm6Vz3DvKXv6cZavRcgwLJ dkhqTFRtBUXBN1c6jw2bbvK1CBQDvzg53NRgr+5wB1tkWr/KgLIGVZDc761q+boWL3kt rN/yRa7Go3DkcW1pxBjmufQ3GbFxLkv2XdWMOS9ygX1H+lIUWcMm4ABAByPEzfv8jRrF QVcqrleSQ3Gb8IcE90tFjbd0dZAC6mrPNtPSpcfLmdzF8Q3QuG7ZtWjrwMxGm9YPinVJ gXo/VUYj/JPGO6CBUYoNSVGL09/lOP/fOlPaFdVSUuJrnOvIvd6Ax5t6RZz4WHy3tckI /CIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SkoozkaB7xWv3v3H2rLnYDJGNp2meEPJ8CYN/joh4jA=; b=OgvI+qBE6JNa29pZGyOczTEP2CkS+SvaZ+2acbyOhI325qBIEvnoa6L6mQ8FuiJPA/ GvB28NKTUFoLJwrAmkRemT51ohh57Kf6RYLV+uYqjzpL6nwl4kZTobYmn+A4GmRD79W5 en8Jq1yzFXEwvx5T79Pk6zyvNHShg3JV8U+Lo4azXbdVoTXDyEG/WfNbM0ARD5HExY4u OuzUSBejFuE9hBsoG8gvigktsF0Tvpho1EVOAvwi6MRT0/k+Rf4jI7hcdNsAH3k/eySR vg3sU779c9AHboeb/9MF/uTSZDmVbl1nNv7BMuogrjYRCBA3xm+iY8phUNW+NRAsLtuE NFgQ== X-Gm-Message-State: AOAM53320FCoMQ7CTGewKaPhEGFXWAmd8HWHNT6JL+O/URXyXq8kLCY3 gW+sGtrKeOoddKTpn/4wQ8w= X-Google-Smtp-Source: ABdhPJx6Y5qY1ZkNIyQkeXH4XxMibACbwCcJEIt8mDdvf0LmGuSy6bMdHUhmusomzEcmzKudgpvtDA== X-Received: by 2002:a5d:53ce:: with SMTP id a14mr25800197wrw.410.1621931193180; Tue, 25 May 2021 01:26:33 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 7/9] gitlab-ci: Keep Avocado reports during 1 week Date: Tue, 25 May 2021 10:25:54 +0200 Message-Id: <20210525082556.4011380-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Sometimes pull requests are merged during the week-end, triggering a CI pipeline. Currently if such pipeline fails, the Avocado reports are available for 2 days. For the reviewers working on the project during office hours, the reports are already discarded when they want to look at them. Increase this time to 1 week, which should give reviewers enough time. Only keep the reports on failure, which is the only case we'll look at them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/buildtest-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 167ee88c410..180bf1aee7e 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -46,8 +46,8 @@ policy: pull-push artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 2 days + when: on_failure + expire_in: 7 days paths: - build/tests/results/latest/results.xml - build/tests/results/latest/test-results --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621931199; cv=none; d=zohomail.com; s=zohoarc; b=dOPUIaDaqcpsZ9CMixWpH2qMjLP1eLpdbetB5JBS9I/HsHIeM44sKCIfgoS0S+DfsMbLbsAt7tqIfheR3hk0MYHJiJVZ0xIPODLPa3beDG0CYPu2A4wlcEudkTPCJ1eeEAwLU2T1rkV2UhFnNtPKFoihR6n92LDq/In8SI94kY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X2CJbYRcvA0zHIHyOmLh9A6596xrw0+LlcvUj1ggyOA=; b=IWT1gCE2TJJ4qFyVzZTRaMHYA+yAvDvGHn4S0HU7Kw8Dv3+TPu0YEbI6xgDuuRwWZu/QvFP1IpCcJRMCpAczVe+F5V+plaHLAwqPXfJGiRh3xG12LqLKUAwBOFL1R6v+3l9cVuuUnH3C8MKZ89zMLM77bAL6v03fqnOJGS14ylE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1621931199903463.04367854264865; Tue, 25 May 2021 01:26:39 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id i17so31182764wrq.11 for ; Tue, 25 May 2021 01:26:39 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id s83sm10240037wms.16.2021.05.25.01.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X2CJbYRcvA0zHIHyOmLh9A6596xrw0+LlcvUj1ggyOA=; b=KcGcgbRQs4OjA0JPgeu2XFG4QgW0fvjreT/wTVr0sV+0kvr7qsMEZ+mfyYsTjt0Bps sQyUTZ9/Wf854H/z0vErUzEjX22NaK8VaHS0gNnYawfyf8oSYdc2dRC7+eqrjv8SEcOv ACWCrJ9b3M/apgpewwwfLukmqnrM478SCSVW5PiBcZZIxAZCNZy919T+YyCZIyZgHhuy WH112WtZtNaDny/Y7EnYGL4m37QVXUv8izsEcRDizGKb1zYe9PtLQYysgBud5kWMdZtR usqPwn/q1iu/YDn96GqBBxi16ppOlnG9HXa3+63odFWCNa14ss4DM2Yw6AqD1XhD+J0o +ZvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=X2CJbYRcvA0zHIHyOmLh9A6596xrw0+LlcvUj1ggyOA=; b=N7KmLejjHHkXxnXiN28LxPqHJACOHNuYBfU4b2cEzGtiDyZKuvWtmhuragslJwIeho Jhshae4vHlCsitdJ5DQXMG2LK78m3xglLoCl4T2aKVueDwhjnCnnX6fXAM8mpQ8dwvgB lkuK4L7FmuhQ2fkt2LabghFwQT1y1XkyqC1c+98xxXRxdwSHsBdf6KumQdYLR3CvcUn0 91Z0olFPOJ1/CoEQGs5klHEOmqKBnLy6ucxdUTmOQx+BHfM+5dE3xnlVXIIcwuh7qpd1 G4T+0K/LyPdhiYS+BEFLKZ65UT8G2FxKCjpMJ4UNqpkqDyN6XxQjh+oRjOk0cUoklVeM ijnA== X-Gm-Message-State: AOAM531dECFNVrcw8LDpE+35pfAxHhCxfhh9PGdLCufhKDwYl6ZnlD3F mxIr/kbcfM7Gu0WAFtxr5TM= X-Google-Smtp-Source: ABdhPJz/jn2B/fQwfHop8vJzTK/M0Zy4w2iCYtsNVVhHGpBgZdV94I+IOg9Qrpey4xpsnyvs+yaGjg== X-Received: by 2002:adf:d1c6:: with SMTP id b6mr26711875wrd.110.1621931198038; Tue, 25 May 2021 01:26:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH 8/9] gitlab-ci: Run Avocado tests manually (except mainstream CI) Date: Tue, 25 May 2021 10:25:55 +0200 Message-Id: <20210525082556.4011380-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Due to a design problem and misunderstanding between the Avocado framework and QEMU, Avocado is fetching many asset artifacts it shouldn't be fetching, exhausting the jobs CI timeout. Since Avocado artifacts are cached, this is not an issue with old forks, which already have populated the cache and do not need to download new artifacts to run the tests. However this is very confusing to new contributors who start to fork the project and keep having failing CI pipelines. As a temporary kludge, add the QEMU_CI_AVOCADO_TESTING variable to allow old forks to keep running the Avocado tests, while still allowing new forks to use the mainstream set of CI tests. Keep the tests enabled by default on the mainstream namespace which is old enough to have a populated cache, hoping we will keep this cache long enough until the Avocado/QEMU design issue is fixed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- Since it is not clear which project should be modified, there is no issue filled to track the progress on fixing this problem. --- .gitlab-ci.d/buildtest-template.yml | 12 ++++++++++++ .gitlab-ci.yml | 24 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 180bf1aee7e..8e6321c2a38 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -67,3 +67,15 @@ after_script: - cd build - du -chs ${CI_PROJECT_DIR}/avocado-cache + rules: + # Only run these jobs if running on the mainstream namespace, + # or if the user set the QEMU_CI_AVOCADO_TESTING variable (either + # in its namespace setting or via git-push option, see documentation + # in /.gitlab-ci.yml of this repository). + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' + when: always + - if: '$QEMU_CI_AVOCADO_TESTING' + when: always + # Otherwise, set to manual (the jobs are created but not run). + - when: manual + allow_failure: true diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c843e5f20e..830c5b7af97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,29 @@ # location of your custom .gitlab-ci.yml: # https://docs.gitlab.com/ee/ci/pipelines/settings.html#custom-cicd-config= uration-path # +# ---------------------------------------------------------------------- +# +# QEMU CI jobs are based on templates. Some templates provide +# user-configurable options, modifiable via configuration variables. +# +# These variables can be set globally in the user's CI namespace +# setting: +# https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the= -ui +# or set manually each time a branch/tag is pushed, as a git-push +# command line argument: +# https://docs.gitlab.com/ee/user/project/push_options.html#push-options-f= or-gitlab-cicd +# +# Example setting the QEMU_CI_EXAMPLE_VAR variable: +# +# git push -o ci.variable=3D"QEMU_CI_EXAMPLE_VAR=3Dvalue" myrepo mybranch +# +# ---------------------------------------------------------------------- +# +# List of environment variables that can be use to modify the set +# of jobs selected: +# +# - QEMU_CI_AVOCADO_TESTING +# If set, tests using the Avocado framework will be run + include: - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.26.3 From nobody Sun May 19 06:50:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621931204; cv=none; d=zohomail.com; s=zohoarc; b=numhRLPixAGbEJn8yXjfAqfJ/Lf0xIW1/gWeyNXKQrA1Cbbch/2DkmszTZ+ArkcunoASqUy3VRqjGi8r7SWzNJmHAYc1BSaseW/bKUT1/I4RdIWH5AcaZo/tbu/jEL7DaL1d070Qj0u/xXHA/V0fBb56akeh/kQp1AAt6Gfm2Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621931204; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p0e3a0Zp2hWBCA67KvWrU4k0qkaPiwmUI0f3UIGc5xk=; b=WsUChmIfv6+VM/s2Ad11TKa82lbozg35+SDxEj9/2x1in3awdo/qleP+BAWvT840F0BBWIP+BQysDnDao0B0/XlZvK9U5R9JNTymtADRcKwV0CF69VysfrBEU1buZ4ejYG6lv9Sm+d8S1t4yk5O7JQyhkQpvO3T8M0TscN3hRf4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1621931204803206.76962376492338; Tue, 25 May 2021 01:26:44 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id v12so31208879wrq.6 for ; Tue, 25 May 2021 01:26:44 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id h13sm10562134wml.26.2021.05.25.01.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 01:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p0e3a0Zp2hWBCA67KvWrU4k0qkaPiwmUI0f3UIGc5xk=; b=VE9/2XmDVwHjKKD+BEDvqDe2jW9NfXVyzYgDHifT1hSTt9WrhsGeRlEmoYUVVOwBoI qsCuUt15OrpQhyvBca7WF1g5sPJcAKdshYgy2nDwG6cjQZ1gKGgHgfx+OzZQKN2UQD9W kgKR4G37l591K8YjGK4gby7s9TL7Wq2tf8HJ4JzJrlgQgHIS7HVxpusrEtJb3K2Gkf/g CU99C0HS4g1NL9/n18bzlbkkwfNK5WNYUkyts99xfeThkxkBhFD2TSx0+uW1l7Ad93pO B9GfFUSdjml1jHWl4tZjMDsXnnVBxAJewn6LH0bm11vXzqAwlMCC6VFK3WwCL9aBA7Su a1/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p0e3a0Zp2hWBCA67KvWrU4k0qkaPiwmUI0f3UIGc5xk=; b=Kbva2RSbky37ITGGYYUfEzr7ggH2ZkLcZmHPLmkIt8w1pGJaEyepe2q9XcYcHZ8bJ5 IGQOSCGJbJ84VjYaHbzwt2UgP8iw/BJA5l4OR6vj0DRMf8DcpmhelbdhKcSRYmIqbjqc yMVQUxy82Qx3JmZCN1YL8kZJW7rPv1mvXTpFRGmpbblK4NRLZ6JQAuG7rV8/3TXUGAqR g9Q/b1UZVaEBH4LHi3CdVwUvXT2+sEG6HWYvhddJsxt0da676yAzPBfa85kzlLPnnzNm pOAgFTO6/Pzr5JSNEUSmhw9hzE4nwCN2TiZYYkq5eibrz5oMdMPbDbYtL3Yx/ut0Qs59 weCg== X-Gm-Message-State: AOAM533NI0mszpRtMrbZhfzmhCwado/pRvu7S60hJEXefF8L5Yeh1Fai EXVxdufgfXvNhwf0hEltwK4= X-Google-Smtp-Source: ABdhPJwn59Du8F7AxzX4BC67gnfyD13lUu2j/KVu5eSr/U7S0V0d0Z4DKyuEeYjZQ8Ol+Nr/uKMyHQ== X-Received: by 2002:adf:f9d0:: with SMTP id w16mr26754920wrr.336.1621931203079; Tue, 25 May 2021 01:26:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Daniel P . Berrange" , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Bin Meng Subject: [PATCH 9/9] gitlab-ci: Use absolute path and simplify firmware jobs Date: Tue, 25 May 2021 10:25:56 +0200 Message-Id: <20210525082556.4011380-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525082556.4011380-1-f4bug@amsat.org> References: <20210525082556.4011380-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The GitLab 'add job on file changed' feature doesn't work well with relative paths: use absolute paths instead. Change the 'rules:' section by an 'only:' one which is easier to read. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/edk2.yml | 11 +++++------ .gitlab-ci.d/opensbi.yml | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index ba7280605c4..f543a10fbe2 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,10 +1,9 @@ docker-edk2: stage: containers - rules: # Only run this job when the Dockerfile is modified - - changes: - - .gitlab-ci.d/edk2.yml - - .gitlab-ci.d/edk2/Dockerfile - when: always + only: # Only run this job when the Dockerfile is modified + changes: + - /.gitlab-ci.d/edk2.yml + - /.gitlab-ci.d/edk2/Dockerfile image: docker:19.03.1 services: - docker:19.03.1-dind @@ -28,7 +27,7 @@ build-edk2: needs: ['docker-edk2'] rules: # Only run this job when ... - changes: # ... roms/edk2/ is modified (submodule updated) - - roms/edk2/* + - /roms/edk2/* when: always - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts with = 'edk2' when: always diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index f66cd1d9089..7bc96a29366 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,10 +1,9 @@ docker-opensbi: stage: containers - rules: # Only run this job when the Dockerfile is modified - - changes: - - .gitlab-ci.d/opensbi.yml - - .gitlab-ci.d/opensbi/Dockerfile - when: always + only: # Only run this job when the Dockerfile is modified + changes: + - /.gitlab-ci.d/opensbi.yml + - /.gitlab-ci.d/opensbi/Dockerfile image: docker:19.03.1 services: - docker:19.03.1-dind @@ -28,7 +27,7 @@ build-opensbi: needs: ['docker-opensbi'] rules: # Only run this job when ... - changes: # ... roms/opensbi/ is modified (submodule updated) - - roms/opensbi/* + - /roms/opensbi/* when: always - if: '$CI_COMMIT_REF_NAME =3D~ /^opensbi/' # or the branch/tag starts wi= th 'opensbi' when: always --=20 2.26.3