From nobody Sat May 18 14:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1627311880; cv=none; d=zohomail.com; s=zohoarc; b=IlSmB7ggzuNcPsLn85nBCBwby3kQ+uWtkcAV5DnfPC2jP9qW8jdf9+XBCsG7MJaXOyNJicUTy3S+K7rrOc/IR5QTIbtuR1FbQntvKANKBpmERkFiLkP+Xhiqu0Juc3joSzFKmWBp8bWxn+gUyHye2zulJbqW6CRYHvcf30qaAEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627311880; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=slgGxAsxuhtdVRDSkYHJEvP8LFK322faI8oQZGFBAXs=; b=gZFZi6WsNDen6mEK4jlHFbJHzQVLp3T1n7YWcACtOSgl6JoXRDqW5kflF5xiL/XAhZdVj3rQA1kjhhjGyPThHyhpkPD8e9NwpxDM2GSTLo7yoCoxtPYSOuKvj3Fdh7A6s3kr4BU38SsIT/MVNhKc8R2PrDwn8T5I2wQztrGpQAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1627311880710277.8311476626933; Mon, 26 Jul 2021 08:04:40 -0700 (PDT) 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-153-tEnKbpO_NE2JZXmNvZgMMQ-1; Mon, 26 Jul 2021 11:04:36 -0400 Received: by mail-wm1-f69.google.com with SMTP id k4-20020a05600c1c84b0290210c73f067aso696064wms.6 for ; Mon, 26 Jul 2021 08:04:36 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311879; 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=KTtkvGqAZwMVi78vc9uvGepETjCiBAoMniCqh74ooatdGYbsMSbUFVgWLcSiVnSbzYpL/V kvpKhaGftLf8Dcbso18jnaq5PjD4rNEV3UU7OOBF7NJszvWGCI0rSUIkwkNr06avYPTktp 8L3YhBLzY7bsey8Q1POftEPOZyM4dFQ= X-MC-Unique: tEnKbpO_NE2JZXmNvZgMMQ-1 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=VI3k1irk0ef7FY0hTcOY63YtjxajEXCHsIO33WutP0BCe1qCmzYZhkGQX+WCp+kqKS oAdWZOiCdP9IfdJ0M3MohA7Mt+gz/qIWpCbBFD5MJdf0pQjERWaIhc2AxYTuW3xhYBLV 6DVSZuMnuF4oECaE7LwG9pOBNlU2g4I4NScHoK1z1EIgOTjnyY4dMZJf1tCbUd5bscvr LeEp7OJ94AU3wiUNo2Rc7UGo9NB9HOzAEc467ZCwXOx200puLabOYSmSNicyqqv8LMRq 88E19fEKt2JKLw+k7i9suFANlKQPyfa6+c0rg21qGWa/yE9n95aucE7SEX8+DIAPk18H uK+w== X-Gm-Message-State: AOAM531bHB7MEgM5tO1y1Ku3CZT/0Ndhi9FIsRfTkJgqKf7z6B9Oa9C7 1rlBjyX6znhNN6jSiPFRv+tP40kDb7QR0yWLbcLF7zOiyD9xQGgqZzirD4f3UspERmHVBCZ4jE4 +4V0E+723WXXeOg== X-Received: by 2002:adf:f908:: with SMTP id b8mr20271732wrr.302.1627311875636; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627311882476100001 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=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- 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:: =20 https://wiki.qemu.org/Testing/CI =20 +Custom CI/CD variables +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +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=3D"QEMU_CI_EXAMPLE_VAR=3Dvalue" 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-f= or-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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 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-f= or-gitlab-cicd +# See https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-varia= bles +# for more information. # -# 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 =20 include: - local: '/.gitlab-ci.d/qemu-project.yml' --=20 2.31.1 From nobody Sat May 18 14:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1627311883; cv=none; d=zohomail.com; s=zohoarc; b=BNjcM2SCrsmauPvhLeBnl9WK79DkESH/6h1QSMylhjU3m9B9cex6Xv3vFl4wE8MODQl6LyRwQ8Bay58yL8+SuOXaDjuniCrot1Zxs+n9PL71sfdenQtDI4llSWJRzZX5X63S2yMc10pNJjCVM1B7LN8PQoyZzlCcCrx6NwtorS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627311883; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0o9YfL6QBLdwGLccWgRGPd+3MwWXJfOAk1JmzEO6pGg=; b=GSJ3RUiz7bIOtATwJ+BecS7+sOHl8+OLbeEegywIsU5VXLQL33xdnvwuDnXr67dUcmkEMk3CZI4OEN7U7/OjDXwgDqpHnOjIiX3ml77b65MuOrWRdaoo2J+FtR+AsWNfEHHem+Hav6wlfKclnIfYEAHfgywGqHWgxScUaOs1m4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1627311883615639.7076191786256; Mon, 26 Jul 2021 08:04:43 -0700 (PDT) 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-457-CR7YWW6kNNa3hgiD_8hSdw-1; Mon, 26 Jul 2021 11:04:41 -0400 Received: by mail-wm1-f69.google.com with SMTP id n7-20020a05600c3b87b029024e59a633baso79887wms.5 for ; Mon, 26 Jul 2021 08:04:41 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311882; 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=ZxMW5hIxEdx8/Sc0HlLdmJVFUuQQT1T59wAV6gGbpRAOLs7M9MXeCjwgU9bh1h2amQ7Ygg V9AiU+CYIFyE1e+Oc5hXW5k+M9pXvkpOf3iHFlaEu1xLeDBT+whLB4MufO2IYHqsZMIh4W rVOemtAwIeNw7phG+Ea3veIFHsdO5nw= X-MC-Unique: CR7YWW6kNNa3hgiD_8hSdw-1 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=TXvx7vv3ta/NQzFss8fTZRelkMcg7SCtCnCrP3G0Q2xRG0xNcnorszO0IrPskUL9ur 4NTOl9at6J2WU4+b+hTdvhkfpYjvsLwsFirJyvI4NcNOg7ihNfqrME0jFMlLQ42F8B6D TG9kLmixsEdk1vqHrRCL0RGL67aBdm46F1iv7JuGRpxRlJm0CdWokx8wSlDKIeTRq2eQ Q0fVQhn7u6Eq22bi0lGou0IFBgupUTNooUqzAubOk1CSMFFD5ErnaIuq18XgHgiAqp7/ hPNqehJwExARkQWQmvSKp0iXMbWHWPHg4UpyWpq+FXXqKNE9OpVE/NfsX7paJwn9u4GN irJA== X-Gm-Message-State: AOAM531C55FGViYU03fzM1+6g4yAYcTI4yFbZX3ol1VrssMd7qkdtfF1 zRmohJdFR5k2DtZt7IhPPVA5c/92T9cz8qMY71sGScxm7Nmjm/qw6sU+zHD+cA3hTESxxgD3E4H eC3UhjySLT0avlA== X-Received: by 2002:a5d:6850:: with SMTP id o16mr19140255wrw.319.1627311880311; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627311885584100001 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=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth 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 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 =3D=3D "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 --=20 2.31.1 From nobody Sat May 18 14:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1627311888; cv=none; d=zohomail.com; s=zohoarc; b=efAwqtDTjNIpw5wRMNCYF5dNOk/KG37SkQn9Glh6G07RnS+6H+zf5I120wfscas86Ph8q9RdLqfzGjMPT16Tj9EjsqWNL4z89+a5HwkPRGTKi7Z2wE4q2l8gHlX+KFH4qpDoYHqMM3zWkizE+MTQrep4DbZJekQ/yJFCcFcq6sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627311888; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=A7WQ+gfdcuOck7JznttPPPqym0HvZVkv947pTW1KIp4=; b=eLroFRzMy68oEBl5snoFzK7JjNdKjIPizw/qLDa5JHFtUA9HoM3XNHNEUXv9uzcWIGXj9LogSShrxy1wUcm2Xbslb8zmSWdOROnRkHqPXU2iN9pbLOIGu3asXmi9ILzrTonnZ0OmShaIkEA6TsiMlpAE4AxsCVp7eHBDdvQV3V0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1627311888045717.7455066240749; Mon, 26 Jul 2021 08:04:48 -0700 (PDT) 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-237-NSUgXR25OPSzX0WXGKZWEg-1; Mon, 26 Jul 2021 11:04:45 -0400 Received: by mail-wm1-f71.google.com with SMTP id j11-20020a05600c190bb02902190142995dso2781549wmq.4 for ; Mon, 26 Jul 2021 08:04:45 -0700 (PDT) Return-Path: Return-Path: 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) 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= X-MC-Unique: NSUgXR25OPSzX0WXGKZWEg-1 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=YDcb9t56uGpKfM3BydQdGRGxljHXLdkd5Mjr6bGmW5cZkmNFPOU6UdFzwmsQA04C7V UJGTtdum0xyRvS2SJLL3BPlIY/ijmRZ3gnGPEuuscsD4NA2eq0upIfNBLikvRzLMougc Wivppp965mejjYcS8rebdiWbdmMPUhnIa1Di0MicXsv4cH4LHqICNWidXo6zmp6FIx9n 7xhl8Ht7UO+pLyfBB0xUYP4Ng420hn8U3mxLBRbeSJL9VIGHY/QNSO5//tnYf0/WUt6e Kq2bSMAKB7c/J6U5q4+udidQpOyKRyEZIyiAH8yDJPUwG14GoP1OXUwv/otO7v+BKdQm NKpg== X-Gm-Message-State: AOAM530iKHPHoq4xpoQgqxK+WFArXLDGoxvvxPIbAPyHRFG8yAen7f8I kDuqyUZwJtQAokeMZqeFYqXH2vKMmzvBNoWGz9ZUAj7VK6D8cHNI0zJRRybJqPJqcTMWwQe6xqG Xvr9PqRS2G+429g== X-Received: by 2002:a7b:c3c5:: with SMTP id t5mr14424971wmj.28.1627311884642; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627311888836100001 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 binarie= s") Reported-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo --- .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 =3D~ /^edk2/' # or the branch/tag starts with = 'edk2' - when: always + when: on_success - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description cont= ains 'EDK2' - when: always + when: on_success =20 docker-edk2: extends: .edk2_job_rules --=20 2.31.1 From nobody Sat May 18 14:25:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1627311896; cv=none; d=zohomail.com; s=zohoarc; b=K+Lq/3h8qO/zoKvA7lHXInRx7N7wJR+LNZMBoS3dJy2lTid0LRT7BX8O5hvto6LNbEFgmsyyoxoLysg+JRd0hwyZxCisVvUYMeuDSDuLnUKCf3QJfRLTq+J6YNRi1E5BZC6DD3PCmB/rr86KoGmr6LphxHd/fEfZSon7ITwqPpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627311896; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=5skV1VcH8VE4F7YVyHyIQxPMq2PPLQR3Z673qUopZ2M=; b=V83jDemH2WbpbiaGEjXJQNOp4yWeeDaLErSD8MWmzHtajtjY3NbDx4SQq5KmNBnvTcM4+nRj8MExcwlXta61MRG0hKmRWGnQToOkuPx20GYSyvmigIbgJ65gsAwiwueiZW5hZmoCmRtuFm8zmLYRY+e08p8PD9mLBoZfBQxvNbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1627311896457866.5324172057109; Mon, 26 Jul 2021 08:04:56 -0700 (PDT) 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-583-af-pEqepPYqff_AW70O8rQ-1; Mon, 26 Jul 2021 11:04:50 -0400 Received: by mail-wm1-f71.google.com with SMTP id o32-20020a05600c5120b0290225ef65c35dso2781448wms.2 for ; Mon, 26 Jul 2021 08:04:49 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627311895; 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=QrU1/duwR6XZrogM+5a+rZb8+34IxZpnaAKiY9DSp9UtyjBkEIEQuhnh6SOJIGNMdsJb7r emh/EP+wAkZtxnO9vxRgCLErLDImV1wDZ22VpzfuR61iBx7I9EZvNJrj5hwUZ/rTkwUK4+ iQX8WEWPJtCAYV6AGemaiaeXyFIV6b4= X-MC-Unique: af-pEqepPYqff_AW70O8rQ-1 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=Q0yDE5X+TO17i2mPaiYijyO9r4ucMp9wyw/Ck5shHSKMJEAfWVDVnorsQTHtcFoxK1 wcMJlEPk8+aEHUd/PXCffpzxLClVNLhgYsnNHc8N+s04cFuoiFJ0MbwrItuCqkuC1Nm7 ZM/XjVMWKbowKDK/RTnUcTEbUcJfHQQeOvwPaAa+aCElOyTVnD8ciCNbUPfJI7SzIbeu HrD8HOCefBUy/MeJbLrXVp9paJ9rghReVEOqhC+WNkUpi3IWuGoZydr/pSsMV3FSZncN kwncYNm2a2oaxRpBPYunC1u6HFfeQ4hFH/amNi/ttOH/p2TKFAuLdwpzmguUC5pZ1gjJ RO4g== X-Gm-Message-State: AOAM5307cnqfIF8wCPqK9Eq8c9zklTEJ6nRxVtN/3mcwBj0ZIJwvLoMJ PGE0I+fdHbSJ1ODxkch+0/5cKvq4MtynJgOmW6CbkYrjKODy4cNiRkc48a967ecxLajNtvyVvQV bT1hbSDZ3nVlskw== X-Received: by 2002:adf:b30a:: with SMTP id j10mr2474472wrd.43.1627311888846; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1627311898584100001 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 bina= ries") Reported-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .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 =3D~ /^opensbi/' # or the branch/tag starts wi= th 'opensbi' - when: always + when: on_success - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit description c= ontains 'OpenSBI' - when: always + when: on_success =20 docker-opensbi: extends: .opensbi_job_rules --=20 2.31.1