From patchwork Wed Mar 24 14:30:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 407826 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp468598jai; Wed, 24 Mar 2021 07:38:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyI1VxHaFJBaH/thU9/hgo2ldRdMWH1uR0hjcVI+ugBRUxd3JVCyW/Drmic34zUG1nu+Gwa X-Received: by 2002:a5e:de0d:: with SMTP id e13mr2697084iok.208.1616596682458; Wed, 24 Mar 2021 07:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616596682; cv=none; d=google.com; s=arc-20160816; b=RWITi72bjgs2WKNNgxCLg3MiDHotd6MpdklG5RMeZXkRmvZg2BToIv36HOxqyhSuDU u4UdL4x5L9HwSZ75ItSS7xUO4vdz6wzFLYb9innzm0PeIJM4wvhF7ivEtf2QAzG9YddP v7w1k2NtJYYK2USEoyXMIqugiqWs18fFzFn4KB0rGf/w8POk41CAsXM12X2ECYU0UFHe BDd+53+cDwxGra/246aUAdlDooz+fUeMquBoLgUBwAg7crIeed/YOBz7hs2bteMImH1y a5OflFjLLjpGxbJKFfTOBo1u8E6AYGIHyCj8O1Tpvazw6uTf5Y9hP926eqTt1qBxBOU8 cjIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=iTIRV2au7uDnVgnh+e3nvQfcgQFM6RJm5G7qLpBLBrw=; b=Q1OarfoTfQFTv71ZMFGuRT3ElpvWtb2GnOs78TRxu1FUdIYoxysJ0v8mhNwHwxFfV2 sJPQ8oKMmO8v3bfggkQbTzPUcKfaLFbUZ8o25omZ3yBqlYXH71jSeFiomULjVyJgAsC1 irybUM1QuxvhlrQFGplHbzOJiUzR6MNp0tyFMnD30n0mEoQZo/biLZMB89zkzFaIwgZj hANry6uW0L2WKfRu77+qNIRBm7igRpum9HBs8gA9/7SkdYJhwORAyCl/kErMO6LmUOJS qsj3qPy1YcMnJ1CLtLnW/Y+KcmLXL30bBZgvCSBA7T9uqRrVBmb3DWrCfDysH2o8hg+v gwDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i4NTPUhL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d17si1658169ilu.106.2021.03.24.07.38.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Mar 2021 07:38:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=i4NTPUhL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lP4e1-0006Xp-Rf for patch@linaro.org; Wed, 24 Mar 2021 10:38:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lP4Wv-0006cb-0M for qemu-devel@nongnu.org; Wed, 24 Mar 2021 10:30:41 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lP4Ws-0007PD-TB for qemu-devel@nongnu.org; Wed, 24 Mar 2021 10:30:40 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e18so24678876wrt.6 for ; Wed, 24 Mar 2021 07:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iTIRV2au7uDnVgnh+e3nvQfcgQFM6RJm5G7qLpBLBrw=; b=i4NTPUhL3a3RmbczQKpO0xNOgJ9+C6oZXifouVcFPbRqWNhGE9rYbTvVjY0Ie94iqC I7UrJB68sw3tfw/1Vb4UYrZFdRsMv7+fhOpNL9Q3Sw/Wm0cqRQa+WNc1pAnYvsAFHil2 YWiyBLq5iljKiL7U/Pi3mcyeVk2fsikJBgedjdgM4zyAgFACEk/JCtUFl2nGcZ7jlqwY pOQLrJ8IeoYCKlJsdvfDGDLFmQ01I1thSqj2SW2ib872Nb54QaghEpMikcPhqGfCEWDi PtYHPDULnS2n1HpBfGERqbtRuPdZ7afOr7/bWVInyJ19VVZVw/m4tgz7trRNoCoyANR7 zIyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iTIRV2au7uDnVgnh+e3nvQfcgQFM6RJm5G7qLpBLBrw=; b=XelBy3I18mY4C58SiXtscXa9WAl1tGhgZKYC6q3sN68KrXZz79Sr4ni9t6YIXqTnIu KIBEa+hRt2ZwBCkzW4c3kOSYIQHpabveCLa4gq1t2iho7/WUyTgAxe8AiPijDzZla6kN U8w8sXyT0JmiklIRbVt7t+tjnJ8pc1nGYHOpEMCzgbpjKyeq2VQ2pWhYe2tqXi1pslqY 1nUjYZire/aQafbacSs2FHuXJMgklXmQMVQw0zVYgD8PZFMZRX4lwYq0FEOt7Em59LGe XvD2J4nGCEarXm2ZAHwbFGFAE+2yZC6X12Z3PaKK720ZstUQjohfJ/mZuiCqR4ANhMf+ ZGsQ== X-Gm-Message-State: AOAM530qGPIVqxsqgulqqvI7xXHJEV8bvtDSDNNYzS5JmhOYxankcqBZ FPFd3ebbG+qME1YwiIMkULXFhF7imtyIs3oL X-Received: by 2002:adf:b355:: with SMTP id k21mr3896250wrd.156.1616596237423; Wed, 24 Mar 2021 07:30:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8sm2158632wrm.70.2021.03.24.07.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 07:30:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A79801FF99; Wed, 24 Mar 2021 14:30:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/22] gitlab-ci.yml: Merge the trace-backend testing into other jobs Date: Wed, 24 Mar 2021 14:30:09 +0000 Message-Id: <20210324143021.8560-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210324143021.8560-1-alex.bennee@linaro.org> References: <20210324143021.8560-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Our gitlab-ci got quite slow in the past weeks, due to the immense amount of jobs that we have, so we should try to reduce the number of jobs. There is no real good reason for having separate jobs just to test the trace backends, we can do this just fine in other jobs, too. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Message-Id: <20210319095726.45965-1-thuth@redhat.com> Message-Id: <20210323165308.15244-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f65cb11c4d..f746d5fbea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ build-system-alpine: TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build - CONFIGURE_ARGS: --enable-docs + CONFIGURE_ARGS: --enable-docs --enable-trace-backends=log,simple,syslog artifacts: expire_in: 2 days paths: @@ -605,7 +605,7 @@ tsan-build: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --disable-docs - --enable-fdt=system --enable-slirp=system + --enable-trace-backends=ust --enable-fdt=system --enable-slirp=system TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=1 @@ -702,6 +702,7 @@ build-coroutine-sigaltstack: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg + --enable-trace-backends=ftrace MAKE_CHECK_ARGS: check-unit # Most jobs test latest gcrypt or nettle builds @@ -739,31 +740,6 @@ crypto-only-gnutls: MAKE_CHECK_ARGS: check -# We don't need to exercise every backend with every front-end -build-trace-multi-user: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog --disable-system - -build-trace-ftrace-system: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=ftrace --target-list=x86_64-softmmu - -build-trace-ust-system: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu - # Check our reduced build configurations build-without-default-devices: <<: *native_build_job_definition