From patchwork Tue Jun 14 00:42:05 2022 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: 581636 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2471296max; Mon, 13 Jun 2022 17:48:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTR5AG2HwbhstBgmvNjquxUzrX5pOLMcKQ05viGTWK+06eJH6nQF2VVaOAnfEBWTC87Nmg X-Received: by 2002:a05:620a:4156:b0:6a6:f8d2:6d9e with SMTP id k22-20020a05620a415600b006a6f8d26d9emr2324769qko.30.1655167700508; Mon, 13 Jun 2022 17:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167700; cv=none; d=google.com; s=arc-20160816; b=ZwBgrY2fftmcwP8g2MiIiCkFmfd49/2TrMWdrDV+s4AnQR3tphqxhbaQExaU0e5ftT 0gG0S7StTYOCallealrfPysThKspmsyD8PUjxLsrKfZlEr/f9pKLA7ureqXOlNadxafr /1fRFgvmQZu008BykLiU8PBZwXeKLcSPoT0cAqrMViUQLT/scCZqLjg5Sujq32THCnJA nFjweIdS+tTfnU6/OmyqctRVbTP12jYdvWoF0R6LgIrtvP32WtKUYg8y17xnGdD9V00j E76pNuJUXgfHENX6V6y+/O9a5uAJeMgZjddqMQqD3PYrXDBHTWiADOwh58qjv2YrA0s9 GgqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=jg6M81HtB7083h/mKgenFw0qO4sRExeJ5zSVWGiRTi9Jcv6UMCNQjfkjkxw6dfiD3X llM8HIJ8LCOdjpokQB+UhbGoLFGDnKVtILoMceDpmwCKZ4r+GzmJwN6s+BW2aGdXAPTu XAc4QocVlgF86/888ZEcGwZPIY/azvRGF8r2OLupxRjwUz8Yi2ysRf4BBuJQpLZ6taT3 F2JOwC7Q6PvB1fUIwdPdRLuRBFNNoDADUiTVj0WFLEK6OkH9MziYo56PrTr5sChuq9XC 5pkOKRVz88heaCq9QgwIixXPAzX47o3qxs8ZrnVEogCt8TTH6Iq3BDnbzNdYmPAuTyH1 GR5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vfW22iCN; 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=pass (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 v19-20020a05622a145300b002f347192afesi5496123qtx.125.2022.06.13.17.48.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:48:20 -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=pass header.i=@linaro.org header.s=google header.b=vfW22iCN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ujE-0006jU-2p for patch@linaro.org; Mon, 13 Jun 2022 20:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udO-0008Mv-EO for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udM-00052E-CF for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:17 -0400 Received: by mail-wr1-x42f.google.com with SMTP id c21so9102630wrb.1 for ; Mon, 13 Jun 2022 17:42:15 -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=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=vfW22iCNEvMUcoLasIUgBD+g2Z02LbbENqvFGssMIUcAZF7/oeGFE02xe6vvy5WXsS qhjOgZabRF53hwF0K2tioP5IZwUQ9Gqlq42IvRXv9XJfsm+wOAitYvxkVtg+8UcD/mWP X9/AObCVRXcLIA4oWVONVh8jFydwobrfumH40G5wJw9A9BKJyLC6aZwX8dqhIt+SlLZG UZNTZXtjoZtT+OPdB0P5uIpqYj1E/F/orZAbh6QjiZ1DhhRWApZgCeB+dmHWIcpB/XsF v4eRIJPunuGB6NuW9/+oE6n73xN1by0souDdSrofzKNTIwgNK0zzouUIlGTfUsmkeh4f gPRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=MCWEnmr405t5CA61M7Z640pju7kN2uQLqXL8LNZAvmbgfm2/UR6pdcPr5vIYa27szC g871RYx49zyw4gg/l4JCUxUnQMeR1VSF/fR/HBYQ9woDaWBBbltRB/OwqSkuJhcmNAOj cFVUd6rTEaMlMAGUgLeoGy98v4nEStlyZJ6Ceax8CKhj2+BFZ0N4WzippnpXHZ/JadQm BI8fU3zbpA7FSxIYsqTz1c2nQHuoOUO2ro30/nFze9Pr9mEoZQ9krA0aQc5Nn59RWTE0 jRT7QLPNQgWAl56XJg8GV7DMuftGrBFIFFWXpqftBE2HI5v3+nstbjHpvjovdHhy7BlZ cR3A== X-Gm-Message-State: AJIora/Ck0GgCVhpQ2YgaNweLtOM93/AmDE80WSDUFtCzGqQszbMnrqK oU3h3SGoz9go8qN8neIyNjSfrQ== X-Received: by 2002:adf:d1c9:0:b0:20f:c3dc:e980 with SMTP id b9-20020adfd1c9000000b0020fc3dce980mr2226192wrd.552.1655167334037; Mon, 13 Jun 2022 17:42:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g13-20020adffc8d000000b002102f2fac37sm11245006wrr.51.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 59B821FFBB; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 3/7] gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs Date: Tue, 14 Jun 2022 01:42:05 +0100 Message-Id: <20220614004209.1970284-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The job definitions recently got a second "variables:" section by accident and thus are failing now if one tries to run them. Merge the two sections into one again to fix the issue. And while we're at it, bump the timeout here (70 minutes are currently not enough for the aarch64 job). The jobs are marked as manual anyway, so if the user starts them, they want to see their result for sure and then it's annoying if the job timeouts too early. Fixes: e312d1fdbb ("gitlab: convert build/container jobs to .base_job_template") Signed-off-by: Thomas Huth Acked-by: Richard Henderson Message-Id: <20220603124809.70794-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220613171258.1905715-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 544385f5be..cb7cad44b5 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -357,16 +357,15 @@ build-cfi-aarch64: --enable-safe-stack --enable-slirp=git TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 + timeout: 90m + artifacts: + expire_in: 2 days + paths: + - build check-cfi-aarch64: extends: .native_test_job_template @@ -398,16 +397,15 @@ build-cfi-ppc64-s390x: --enable-safe-stack --enable-slirp=git TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 + timeout: 80m + artifacts: + expire_in: 2 days + paths: + - build check-cfi-ppc64-s390x: extends: .native_test_job_template