From patchwork Mon Jun 13 17:12:54 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: 581423 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2173863max; Mon, 13 Jun 2022 10:18:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tD7iU2aYKlVGWni43eYldKlu2V9pdAdQKdkGseOh9HeWJqQsFM7TlLEzyv27MPc3Vy2FYu X-Received: by 2002:a05:6214:260e:b0:467:654d:85cd with SMTP id gu14-20020a056214260e00b00467654d85cdmr98636qvb.17.1655140698481; Mon, 13 Jun 2022 10:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140698; cv=none; d=google.com; s=arc-20160816; b=x16TDlhGY27nLQhbJHHTN0hRQQVOvOJgsDMVWOI0OtGUKyFDqagDBJUmIoVtpS+zFn Km2ufqRV+SiSX9xq2IDVc2gfSGz9YZlGoiJonFhSSA3IdVRV+BOm0ZBpKtqDvOhUtRhh t57KN0WXT7rcwb4A1zc8xed8ZOPjS0XDzipzcuKcd30jsS8gfw/gl5R10bbChMfDaA22 jA8WXeqqt5QdQrnXoluWmva7RBu6ltBnm1tUmiSBCDuLAdSF3U+4olF5A4LnF8yI+de0 pCDoUfhcqe7bNiy0aLewhkcP/SDBvOabw/DybrF3lQEFLx5JsRyQ2dUydISlUpGqaqzM ApzQ== 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=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=SzXlLcMo1UEOn5hhNOmCMERz2LS6eKiQTj0lefeaACPYjI4y8uP+rphHgRs4+j9J97 bhzOxkzfz9uEbzbJ0lf2KW2eAAcwJLtvFUiyX+ih5JpBfvv5UwFr7iH/iv4o25KeCgTH 2SsGoXE8xjwKoOUkFjFoQw36l2iJfkO4DB4WR4chaTYO2PwBz1zfRcCxVvSrcjIskDem mqvwFny6uQXI7bYIogCO/4FANA7NUjqIWB+XMIRUnLW/GBehuBRHcfLViMfkuFRiaqd5 o3fCieKSn36/fqqtAwPDGZnmpq1Q0vqpa/rSwTQHUY6/FTXgZ/om3pw3mNENIw1nIX3U BWyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="A58wzM/t"; 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 k2-20020ad45be2000000b004673b1f1de3si4816604qvc.164.2022.06.13.10.18.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:18:18 -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="A58wzM/t"; 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]:45580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nhi-0005za-15 for patch@linaro.org; Mon, 13 Jun 2022 13:18:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nci-0001HH-Cz for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:08 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:34499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncg-0006wV-Fw for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:07 -0400 Received: by mail-ed1-x52d.google.com with SMTP id o10so8105644edi.1 for ; Mon, 13 Jun 2022 10:13:06 -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=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=A58wzM/thC1RKZ4kNI98Vh786epLQrgE51n+Dn3LXw6wQvej+CBRS5fRE2pZLbc022 Rw2OG0FDJoN9HiyOmUtJli4V5tb+kLtB6CbjTCUiQlyQPjEHvi8q6J//vH++WG3klma7 rR55u5Dk24+0OD23nKh9kHrisHARfypI/tfIgXSVSZVMC63QF3C6+OicGkLFrap2WjR9 YLrd4V9B173jTcXmUFJg59OSgwC4zAH8AFQUcKdlyeyglfLBcf2dvrFSJgWHAG1KWlkX q4uvsAkjLDpixOYufVFyuJFZVqqYzAZ5qVoze2pdbfW+xDMctCe/YNBs2rqWi/NCQo5s ayiQ== 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=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=0n6GVW26MgPBn9xTVuwX0BdWmXd1yLDCZS1Fpou5q6a0bFI10Tup0xgGfK3mKIaV31 icHR2xQuYgH1Cd0ejKInaanIEa3NHdkwG5EokR13vHBB1HJLCS1BsfAtbq+wWSOYNjaN X4haOZcMJvTU9733MTcVt4yAMBaLOEB7jkguYJyGgV/OGRXX5cZN0aTgVu8R/kMtbErl qwHLTrvv+Surle1fYvF+pfFP3FJnnoHnvi0Vs2uBxM+UgpUmOin3SvjioDiIgAMv85yC CMT/5vWxHcto7nVElbz2kZYMx9JPCMBsjnY6JEyPyP0MIQClpUuxcOKyQHjj/LSFmb/R juQQ== X-Gm-Message-State: AOAM530TOBEqg1iYNIo4FIvAIGsjIguCQ3pQDoloJjnYlbSjQZ6XN9DI GLySBAUuVdkgGtSOLq3h3RK8Fg== X-Received: by 2002:a05:6402:40d2:b0:42f:ac14:34a3 with SMTP id z18-20020a05640240d200b0042fac1434a3mr852194edb.262.1655140385125; Mon, 13 Jun 2022 10:13:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o25-20020a1709061d5900b006fe98fb9523sm4042738ejh.129.2022.06.13.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 43B5E1FFBB; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 3/7] gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs Date: Mon, 13 Jun 2022 18:12:54 +0100 Message-Id: <20220613171258.1905715-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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 --- .gitlab-ci.d/buildtest.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) 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