From patchwork Mon Jul 26 15:04:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12399897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82304C4338F for ; Mon, 26 Jul 2021 15:07:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCE3A60F02 for ; Mon, 26 Jul 2021 15:07:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DCE3A60F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m82Cx-0006Xj-3O for qemu-devel@archiver.kernel.org; Mon, 26 Jul 2021 11:07:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829x-0000lh-Iz for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829v-0003SZ-NU for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=slgGxAsxuhtdVRDSkYHJEvP8LFK322faI8oQZGFBAXs=; b=ekKgKv8fVRHjSywcTizUHAz0imPqUNvQr7yeQ5V4FgHZYsy1SBr18ag2zx8hKrBqb+OOMA jBdtCN02XATQ9ZFCmurbbExbI8KELSqPqVkhlQEum9kwMUa+VMZZssNglyaTqiWvqQeVwn uV3XIiJ5YEaqnCY/Waq+qHvZ/+XpAMw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-UOx5nrabPam98hHLpVjXww-1; Mon, 26 Jul 2021 11:04:37 -0400 X-MC-Unique: UOx5nrabPam98hHLpVjXww-1 Received: by mail-wm1-f69.google.com with SMTP id o67-20020a1ca5460000b0290223be6fd23dso697056wme.1 for ; Mon, 26 Jul 2021 08:04:36 -0700 (PDT) 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=slgGxAsxuhtdVRDSkYHJEvP8LFK322faI8oQZGFBAXs=; b=WQXTUp40D7NI4mRXqFhoDkLCzbfSnKMfL5xJdkACoWdx7olIIYciYvHi+5l3TYprZd ofT54saz0yqb4N2lsI3cZyoAPw+UN5Qtzct5H5PRUVud26EWyvGT8r6k3lBDE/xyQT8w TxT8Wj6rQJ/tim5O/uM3w99JY/XrKErPe7AW3tUyHBcs05bmDeHpyV8XOX6eYqoeZS8S BOJ7uniMTQcoF0V4WrHvYON7dVutcmWzpWPPBjtrfy9ZQ/fkr/wGCGJUnjVw0WfZ2vhO WXcEJokTtZFkCxSCSB2vd2MGoX4jY7w0vyny+Li46qnD1JrrruWdPhvhh+M8XdmKV1ye I2bA== X-Gm-Message-State: AOAM531NDzo9rUP2X/bGqffPfkhgqfTMHVYaXlMynPGqmrNrk/WiWUzn p95ge3MTgeKR7kCPqkoUuX5pK1GH5LL2/TLmc8hzcYNRM0vijtm3o7OKq+ccRtGG9cbpZD2pIC6 AaiHlVtBsKSBRnkAob7LeU+W9GFgfJ7u1B6qIVscUkMDi7+g9K2L3X20qRtyM9/Fq X-Received: by 2002:adf:f908:: with SMTP id b8mr20271741wrr.302.1627311875719; Mon, 26 Jul 2021 08:04:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJZlsWpsLS1NPp5Nss4W4Vu73JatZGwGLI3ItNgVJEY0AiQV+rEdhwZbOkZioWHM+hSlFzKw== X-Received: by 2002:adf:f908:: with SMTP id b8mr20271710wrr.302.1627311875503; Mon, 26 Jul 2021 08:04:35 -0700 (PDT) Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id d24sm13775875wmb.42.2021.07.26.08.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 08:04:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables Date: Mon, 26 Jul 2021 17:04:26 +0200 Message-Id: <20210726150429.1216251-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726150429.1216251-1-philmd@redhat.com> References: <20210726150429.1216251-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Bin Meng , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now. Suggested-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth --- docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 19 ++----------------- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/docs/devel/ci.rst b/docs/devel/ci.rst index b3bf3ef615b..53df04afb7f 100644 --- a/docs/devel/ci.rst +++ b/docs/devel/ci.rst @@ -8,6 +8,46 @@ found at:: https://wiki.qemu.org/Testing/CI +Custom CI/CD variables +====================== + +QEMU CI pipelines can be tuned setting some CI environment variables. + +Set variable globally in the user's CI namespace +------------------------------------------------ + +Variables can be set globally in the user's CI namespace setting. + +For further information about how to set these variables, please refer to:: + + https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui + +Set variable manually when pushing a branch or tag to the user's repository +--------------------------------------------------------------------------- + +Variables can be set manually when pushing a branch or tag, using +git-push command line arguments. + +Example setting the QEMU_CI_EXAMPLE_VAR variable: + +.. code:: + + git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch + +For further information about how to set these variables, please refer to:: + + https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd + +Here is a list of the most used variables: + +QEMU_CI_AVOCADO_TESTING +~~~~~~~~~~~~~~~~~~~~~~~ +By default, tests using the Avocado framework are not run automatically in +the pipelines (because multiple artifacts have to be downloaded, and if +these artifacts are not already cached, downloading them make the jobs +reach the timeout limit). Set this variable to have the tests using the +Avocado framework run automatically. + Jobs on Custom Runners ====================== diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dc5385e697..9762dda2ee3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,24 +16,9 @@ # 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-for-gitlab-cicd +# See https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables +# for more information. # -# Example setting the QEMU_CI_EXAMPLE_VAR variable: -# -# git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" 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' From patchwork Mon Jul 26 15:04:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12399893 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0785C4338F for ; Mon, 26 Jul 2021 15:06:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BB0660184 for ; Mon, 26 Jul 2021 15:06:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5BB0660184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:42340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m82BJ-00034K-Ds for qemu-devel@archiver.kernel.org; Mon, 26 Jul 2021 11:06:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829t-0000ZI-4V for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829r-0003Pj-MC for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0o9YfL6QBLdwGLccWgRGPd+3MwWXJfOAk1JmzEO6pGg=; b=Cco15Tn2y14Sg6GsqHcDPZqJ36OlegVC1qAyMUUewZH3V/NIPNDYtEhlNrBWIwmps7cqiV /lIVHsFcd5vUEWe2HgXeK8OwSjf+tNGOwW1tF50nkNIuxJF5J0B1DU7DDlPxUJ5Ci2AqmU c4cyvr1THg6PfUI3NsXDjIQDLP5OuBs= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-536-oOtPmvaAP7avkVXAbAdXjA-1; Mon, 26 Jul 2021 11:04:41 -0400 X-MC-Unique: oOtPmvaAP7avkVXAbAdXjA-1 Received: by mail-wm1-f69.google.com with SMTP id a18-20020a05600c2252b02902531dcdc68fso285224wmm.6 for ; Mon, 26 Jul 2021 08:04:41 -0700 (PDT) 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=0o9YfL6QBLdwGLccWgRGPd+3MwWXJfOAk1JmzEO6pGg=; b=QyN79gsx9CkKR2QKifxuFtqMj81ziD20x/mgOibGpJVt87v5Q3zbmobQE3exnkGIjW Bw4G8SErkVbMaW63ElOH+1CkwARrA/Dwa8lKtXdhAzVn1XpcxpJJHOatunfyB01iuOqg 5ochd24bCZFNTmvxdS597bxRIFvLRvUzJi/dxsdAEghT7P3h5GH1SW18t97qdoI34hJR fuVbAYAkMnJ3tif9Tdilhggbq765rvE3ds4cyP8XJZ/KOQ4SmcAUmpkn6iIE0rxxP5XK soSaW2Jm/jEf17FE1NQ6w/50SRdvIMHTmEvROpQGdfotNuvKmOr4y6ZWAF4VKeQeq8Dl 7iyA== X-Gm-Message-State: AOAM530KGB+pGslGA15OwLvemCLCp8QDZM6bNX92OmlX15l8DFazQEJ6 JeHsnRdzGdv183kbBMLX57P6iTkfIDhD0cFge96NQbBKCXUlZIItp2f6l7MKn5n/RwOTx1HJeil 90S1DObTfbf02sU6Z1n8MmsB4Cb/8okSnbaFwpfCfB7H0J1FpFMRYX7QZa4FiPW7G X-Received: by 2002:a5d:6850:: with SMTP id o16mr19140266wrw.319.1627311880347; Mon, 26 Jul 2021 08:04:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZHtFlUA4mAo4wyma/3yuUV9Ccg1h2zGwVSqUrvQcps01MVuOTB8rRk0/A/ZD8i0zrduJpOg== X-Received: by 2002:a5d:6850:: with SMTP id o16mr19140241wrw.319.1627311880200; Mon, 26 Jul 2021 08:04:40 -0700 (PDT) Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id x15sm51069wrs.57.2021.07.26.08.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 08:04:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.1 v4 2/4] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template Date: Mon, 26 Jul 2021 17:04:27 +0200 Message-Id: <20210726150429.1216251-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726150429.1216251-1-philmd@redhat.com> References: <20210726150429.1216251-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Bin Meng , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'. Fixes: f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth --- .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-template.yml index 3e3e19d96bd..fcbcc4e627a 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -73,9 +73,9 @@ # in its namespace setting or via git-push option, see documentation # in /.gitlab-ci.yml of this repository). - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: always + when: on_success - if: '$QEMU_CI_AVOCADO_TESTING' - when: always + when: on_success # Otherwise, set to manual (the jobs are created but not run). - when: manual allow_failure: true From patchwork Mon Jul 26 15:04:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12399895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1594C4338F for ; Mon, 26 Jul 2021 15:06:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9592960F59 for ; Mon, 26 Jul 2021 15:06:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9592960F59 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:42806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m82BR-0003OL-Oi for qemu-devel@archiver.kernel.org; Mon, 26 Jul 2021 11:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829y-0000nx-BB for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m829v-0003T1-Ql for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A7WQ+gfdcuOck7JznttPPPqym0HvZVkv947pTW1KIp4=; b=O0y0z7obbrB66WlJ+PEks0vIOkge+Us/yqCp7HLsLn8Wt2THWMoFE/5q9Zk5EXGtMoE78E f25qcR1v6kQzH8vQb6wuU5kKDx0k1yuEMqXfxVgVfjshl/nHfj3XDZS72Da4YDMUA/32D3 OeZ6I2zLc1ur8vacRMPfxKeSCkRrtfI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-pnEauBhBP1mNqBLiMOdDig-1; Mon, 26 Jul 2021 11:04:45 -0400 X-MC-Unique: pnEauBhBP1mNqBLiMOdDig-1 Received: by mail-wm1-f71.google.com with SMTP id f25-20020a1c6a190000b029024fa863f6b0so967973wmc.1 for ; Mon, 26 Jul 2021 08:04:45 -0700 (PDT) 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=A7WQ+gfdcuOck7JznttPPPqym0HvZVkv947pTW1KIp4=; b=qPiBOI+Jl5kO36OkAYBaD+QBgJdoJVRixmxD62Ifs+HziQ2B3GcjROUYM3d3ksLYHk Ii87G1sPfeqs3shINZVjt1iqXrQKHM7epA9LqrvQXoOJSJuLRWmFpjCy/Kgef3t5Wq7n 9MwoHoKVYcdIPvg/6YiGrj4dNC8LwQazNduO02Ycu0r6uh0SiN2OyQnKA6tvN9GzNdsn l++s1cW82U4UBIMkH6nA0WRo6CrJsjTrBrGIECOqUdrt9UHVeL1FgUs20ai4bYqqLP0v McYqLuuPZmttZBoamyDQmKqwAKKrV5kTJEFOveDUfIaWR7g5IXpjyRTfPASQFrIwZGmy UStg== X-Gm-Message-State: AOAM532woWeaGfQRQZU4uFe6ibixmwaXMZkDw0yp93NfDTyZDTKXRNDv Z+N8UOu85mnPhDk3VJEFJaA3yWzodp67dbR4QNRQTsqqNd6221HHRXvHoitCcvzqf61spuR321R h7G4huzH42qN7ZwkpxY9pdvQxC7Gtn6GZBj6jwi0E2qQfwwRAk6WtsfsYXj+SdtiO X-Received: by 2002:a7b:c3c5:: with SMTP id t5mr14424975wmj.28.1627311884661; Mon, 26 Jul 2021 08:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXjXb+R7tEwfKRUpeZm9BCLsfS5rQb1GV8yggX8D1Y4JUTy4fa8mEhCINtKXteMug3qt2f/A== X-Received: by 2002:a7b:c3c5:: with SMTP id t5mr14424963wmj.28.1627311884512; Mon, 26 Jul 2021 08:04:44 -0700 (PDT) Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id v2sm59634wro.48.2021.07.26.08.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 08:04:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.1 v4 3/4] gitlab-ci: Fix 'when:' condition in EDK2 jobs Date: Mon, 26 Jul 2021 17:04:28 +0200 Message-Id: <20210726150429.1216251-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726150429.1216251-1-philmd@redhat.com> References: <20210726150429.1216251-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Bin Meng , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'. Fixes: 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth --- .gitlab-ci.d/edk2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index aae2f7ad880..62497ba47fb 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -8,11 +8,11 @@ - .gitlab-ci.d/edk2/Dockerfile # or roms/edk2/ is modified (submodule updated) - roms/edk2/* - when: always + when: on_success - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2' - when: always + when: on_success - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2' - when: always + when: on_success docker-edk2: extends: .edk2_job_rules From patchwork Mon Jul 26 15:04:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12399899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 965A3C4338F for ; Mon, 26 Jul 2021 15:09:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E06460184 for ; Mon, 26 Jul 2021 15:09:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5E06460184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:50950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m82EE-0000VC-Ek for qemu-devel@archiver.kernel.org; Mon, 26 Jul 2021 11:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m82A1-0000xf-MW for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m82A0-0003V7-2w for qemu-devel@nongnu.org; Mon, 26 Jul 2021 11:04:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5skV1VcH8VE4F7YVyHyIQxPMq2PPLQR3Z673qUopZ2M=; b=UzIsZyDohSswqxgjB71GgX5sq+wkQnmXOZLPat7He2kzI+sFmcw57fNAY8ClzgDIX6VC3g 8NH5/UftJEw1sBG1HuhyPvBTvTg+FmQaqw5ecHnbYoZJydkXG6sAtmFqT5Xy9SbQ/j8sMd oVKjCqfJKxkx5blg8LaCDdr/9d1pWDo= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-tDzkC4u5O-68JwYXO-peTA-1; Mon, 26 Jul 2021 11:04:50 -0400 X-MC-Unique: tDzkC4u5O-68JwYXO-peTA-1 Received: by mail-wr1-f71.google.com with SMTP id d13-20020adfc3cd0000b02901531b0b7c89so4318952wrg.23 for ; Mon, 26 Jul 2021 08:04:50 -0700 (PDT) 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=5skV1VcH8VE4F7YVyHyIQxPMq2PPLQR3Z673qUopZ2M=; b=isrP4YFsvr/GyWjW6zcTWKuCBAj4AZyF5adV6BFs3KjJ/LbPmADuJnvp+TvHLeKDgq M61W0winPbJmRn3sWgogEhcpAZlzvFDlmOoIFi5gUmE5JJMvMYF63dMGdvRlLkJQGgAH gquLKni95hhVQ5mJy8kdZTie1ic8OQ90TGchkL1Di4Xm/rnWstBA5+5Xb6T4KjY4GV1T WB+iY0vUKJzijHLspf453mzrqH5jDynmAlyAT6K+HIaqHMIiD4sffMKYjUpRL+d8wMAE w1J7kc99I3H7/6EhrVS3YBsmhrKQoXHbGneHAvpadIUmh6kDKfsM3My/ZLgvEUuGzYps Dc5Q== X-Gm-Message-State: AOAM531/IU2pwYqRuNzzyGj9VEcgyP2VaQuGh68yRJHglHN4pcNvQADx aJb3e+xhUVi2WQQOWnEyty21eGLWFCzY2UoiGxjIWUXPb4Ym0M2PpoMYvi0taMiUhMH8ifLuFu0 +e4ZIkXc43LecNoN2m5bzcXyGRcwYoD23WJO2QfclGklqcAlqBPIBcggbwdquOCdk X-Received: by 2002:adf:b30a:: with SMTP id j10mr2474476wrd.43.1627311888871; Mon, 26 Jul 2021 08:04:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCyVd4Xu3V4StsmyhTHLNVh4wmghvK1JPqN34fMgmMCmKPt1MwkX0m+9F4LcR0rXCn8wa1Ug== X-Received: by 2002:adf:b30a:: with SMTP id j10mr2474449wrd.43.1627311888713; Mon, 26 Jul 2021 08:04:48 -0700 (PDT) Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id n8sm60671wrx.46.2021.07.26.08.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 08:04:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.1 v4 4/4] gitlab-ci: Fix 'when:' condition in OpenSBI jobs Date: Mon, 26 Jul 2021 17:04:29 +0200 Message-Id: <20210726150429.1216251-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210726150429.1216251-1-philmd@redhat.com> References: <20210726150429.1216251-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , Bin Meng , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'. Fixes: c6fc0fc1a71 ("gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/opensbi.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index d8a0456679e..5e0a2477c5d 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -6,14 +6,14 @@ - .gitlab-ci.d/opensbi.yml # or the Dockerfile is modified - .gitlab-ci.d/opensbi/Dockerfile - when: always + when: on_success - changes: # or roms/opensbi/ is modified (submodule updated) - roms/opensbi/* - when: always + when: on_success - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi' - when: always + when: on_success - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI' - when: always + when: on_success docker-opensbi: extends: .opensbi_job_rules