From nobody Mon May 13 19:57:20 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=1627395883; cv=none; d=zohomail.com; s=zohoarc; b=BVnxzZnE0skVX0bWSI4p7QnV2vGx7+Dw0zLbNphgh1kRoHRLXlw7qnTbn5cXGqUPWMHu6/wA6wiXm5Zx+W6bpvN5+8y6Mec/AeF//ew/8oy3NWMQRA2BLM+2u78OWSzCva8wDMr69dvpjdOd3iP8w6D32T2k0CK3ImLEWmEBqi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627395883; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=47FZeHkD8NUYnjKnwioEIzHdD7XGBpqWb+6R03bKg1M=; b=i8bxOA3NmzqWDxry38do5/azBAWy46FkseqZFy1z45/rAmK4AEtoC2W0GYy59xCQ029mCqEcxNMtMzd4nLnmPE/wIcKmGZk/rg7S1Pbv568d+EDTyiSnOwPkDqSKxEBuVWdxLV/+XulQWbf25Rqra1YDGAJ1qerZuwdWEX5tdLQ= 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 1627395883606888.4910861017698; Tue, 27 Jul 2021 07:24:43 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-9-fCIQraN12AgkX9OSpnkQ-1; Tue, 27 Jul 2021 10:24:39 -0400 Received: by mail-wr1-f69.google.com with SMTP id z10-20020adfdf8a0000b02901536d17cd63so3363743wrl.21 for ; Tue, 27 Jul 2021 07:24:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id m7sm2745669wmq.20.2021.07.27.07.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 07:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395882; 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=47FZeHkD8NUYnjKnwioEIzHdD7XGBpqWb+6R03bKg1M=; b=hKL4rkVPzwhsIMN37qwxw76XnIBw07Th76aBVQwehz+4CvIHWTrIza50ZLbrwUx5rjeX7C bncstfWhJFtvEThImKbGhHRvfg8zjrFCFFU5iSr4uCWtYLCCH7DZEbiW1QirCyJsLiKHAu sa1bUGCBMOCrEo5nf5g3K9ulwIpKk7s= X-MC-Unique: 9-fCIQraN12AgkX9OSpnkQ-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=47FZeHkD8NUYnjKnwioEIzHdD7XGBpqWb+6R03bKg1M=; b=XcVMSGsyHk8x7WMcMKj86sszwcpFFP9OoMkisyWKzUKzYuSgdrIHr9F0Wj5MdJ2+MO TEqQdcmNb1VW+f/f0S2/lZ39HNJVbR5IL000gF/h7DrlUYjBEqmxHVgzBVZn1g7ykXmv +2thKjqlCfEc8eKH6DiS3u28Q7To1rlFiARxGHzaLN2AhUTHAh7/nzgQ/vUuxd7qCkrq VUw1kULd6Hlev+ucLtPN2NsdIwwdQa3dCnzXbJHFVE6jo6cReXzJWNuE1wxyDzO5XjB5 DEs4tov0ppSEzTCJn+4iWsGZCP9sHb2weINsGLKcptdskBPWU+MzipCOkmGH8l7Qk+L9 E57Q== X-Gm-Message-State: AOAM533QZ7ZWrJR2tRPgMlbkaZYCqHZLzhk9wBWCmZof8uCE3f5NP1/B 5g6qKBSlSyqRc8rheNXuRRMUnTkwYG0apkAEpf7JHPMj2DhmQ+P2jNcyGa+9M40TgLj5KZKmlqb ++3VjJj05DDIWiQ== X-Received: by 2002:adf:ee51:: with SMTP id w17mr10237957wro.279.1627395878626; Tue, 27 Jul 2021 07:24:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0etw1KJDfvRkll1Nev1pclIpUWWclE9r/qOfi4Hfvcl0Qum9T1ntwMSzplpfzmOMhasOmjQ== X-Received: by 2002:adf:ee51:: with SMTP id w17mr10237934wro.279.1627395878411; Tue, 27 Jul 2021 07:24:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Willian Rampazzo Subject: [PATCH-for-6.1 v5 1/4] docs: Document GitLab custom CI/CD variables Date: Tue, 27 Jul 2021 16:24:28 +0200 Message-Id: <20210727142431.1672530-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210727142431.1672530-1-philmd@redhat.com> References: <20210727142431.1672530-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: 1627395884148100001 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 Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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..205572510c6 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 by 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/#add-a-cicd-variable-to-a-project + +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 Mon May 13 19:57:20 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=1627395886; cv=none; d=zohomail.com; s=zohoarc; b=ZsbaQ7GdX6oFUVGMGcHmLrmHep5bhaAHcS290ferFr7iNJF6AtbkbvAQSScg3D/zRR4NJr0DMpkVu9zTodEblyy9CVfgrZ+GKm+TvQIVErxZCgJNLiv5aJzLMoWerbdnn6FzjvjKT30oAwXxAj6kbFO/nmR7N+kMtS5WGvaM6sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627395886; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=I3f5VWr0dv08m9hk8YYT+1REocG8ozdjKKxl8Jc6Yx0=; b=CR5Uljn/197R0YHwkVI1OXHhaiweCMw4YTV8JXE8kdQb/vlgUdzqr457bgu99WRgVLBtoDzBopwJFLmxQ6beRHY8FR9cn2a6X31pNJ/979jEKYTZBywLXTWgWUR4sI1Meyhnwt1oEd3aaaUO8a9VCLdRKDmA0ROD/n+pNSEBNno= 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 1627395886356280.5903405721783; Tue, 27 Jul 2021 07:24:46 -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-515-iHtoTCM2MPuYEgmA-ALlfQ-1; Tue, 27 Jul 2021 10:24:44 -0400 Received: by mail-wm1-f69.google.com with SMTP id n17-20020a7bc5d10000b0290228d7e174f1so1046146wmk.0 for ; Tue, 27 Jul 2021 07:24:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id i5sm3406249wrw.13.2021.07.27.07.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 07:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395885; 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=I3f5VWr0dv08m9hk8YYT+1REocG8ozdjKKxl8Jc6Yx0=; b=Psu5dcBTfo3GWX4blw4X6sU4xrrWLWmvYcAK7WnP36NRFxyhj6bmlS1FpL6KxlpUKtW73v maVq332uJA0udGPqw/OGrGD53WnLHAY8gke0HvuvS77dyGXoGyhYVPkYFkOdKAXRS1Mrrv 0j8orD0ihQNLINQB3XZr8My+TzH8tMg= X-MC-Unique: iHtoTCM2MPuYEgmA-ALlfQ-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=I3f5VWr0dv08m9hk8YYT+1REocG8ozdjKKxl8Jc6Yx0=; b=sgZMZ5287KI0dljC4cdAFn8INy+KIK4WtmXc5c0Wl5KJmYU63cVHpSXMQOvns5oUW1 XfjheL9wOiyNoxI1IN3+fUt79Yhgz/9Y3rhXGuDjAT5chhy8rYrXlImrxz/iIohr9p8W ZwiWI7GpU5bRR5E9o8prBC5QgBUcyY6F+0M/2BKnFWdtYEFxyUir+S8AaUr4AKJgGLrp HucgBtVWK+PYCspN3LT5KCwxXoGaA4LET4FB30CbwEubUzJgODQ+f88Ub9B9+fNIr1Td nuQzaQbqpAiho5SfVCoK9c10oCj1U2b3z213icyTp+iS61Ce0IxS0UHxN9GlXHyzC3iW JDkw== X-Gm-Message-State: AOAM5320+cwQze+LZgfTHz7az23BDFoJUcw5kiRkil1UNBKuIR1a6Ey/ zd6i0sCuSp9ORU3zmITrEjGsMJZRSbOplJoie9kULyMzeO+P5cEnzIaZYnb4VnqWDfMshjGDlaN mD2FL30Ng3SSChg== X-Received: by 2002:a1c:a510:: with SMTP id o16mr19672127wme.176.1627395883023; Tue, 27 Jul 2021 07:24:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyu6NTNnFCWbA6QW9ELUDqbopzmm80tdaGb0t9D1WlxPogIsAlZCRC+eyYCWwiNnimURM4rpQ== X-Received: by 2002:a1c:a510:: with SMTP id o16mr19672111wme.176.1627395882898; Tue, 27 Jul 2021 07:24:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Willian Rampazzo Subject: [PATCH-for-6.1 v5 2/4] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template Date: Tue, 27 Jul 2021 16:24:29 +0200 Message-Id: <20210727142431.1672530-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210727142431.1672530-1-philmd@redhat.com> References: <20210727142431.1672530-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: 1627395888308100001 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 Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .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 Mon May 13 19:57:20 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=1627395895; cv=none; d=zohomail.com; s=zohoarc; b=Lgy0wBjxWUehgOEmCml13FdEDwwwSqQUGQ80vWeIArmrjvk9qhxaTj81AZ4siZ2eu6wBJ5pbu36Mg7/p0F7BdU+LCPDzsrqYSKggrCvW9I7z21GPJ6Swt2UWh6zUAB8phDEiOTtQJh/5OF/ZoGMLL11pmUtTWoCvGALhBLbKn8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627395895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MMJrXb+PFcst+HWZFJy2pURo7XBZnh85p1BTZSd8Zaw=; b=VEvIh919In0D6x/Yx4XeKI6NiZwBjzvoKdhinPQ/EySsUyA8SbARgRHGb0Dydgan07UHGFdFbkO1QnwwosJXkLo9UIAgm912KnmJgLc1+YvCpYypZztXQ5E9yaGd2OU0y8F0zHFRrSxymS+K3o5PZ+87i2bDB+kSRydCYrg62HU= 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 162739589509454.855182097013085; Tue, 27 Jul 2021 07:24:55 -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-183-mXq7wXwtMZ-rKnc8ZpmOsg-1; Tue, 27 Jul 2021 10:24:48 -0400 Received: by mail-wm1-f69.google.com with SMTP id n7-20020a05600c3b87b029024e59a633baso1438207wms.5 for ; Tue, 27 Jul 2021 07:24:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id a8sm3273803wmj.8.2021.07.27.07.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 07:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395894; 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=MMJrXb+PFcst+HWZFJy2pURo7XBZnh85p1BTZSd8Zaw=; b=QO+aFXZGa+bYSIf1tf5l7Ag9xawz7rC+km/yuFF2MSjQttrOwgzUUF8jdop/SbEeJq63/W PlpwFasVijcWSVNztIWIB2G5EMEZexS+RjEmWmw244ugrl7uadVT1+OSPZagmUn+Nws11V FxG6GMJabEuOxoGKDqY9nFqrtYKtsio= X-MC-Unique: mXq7wXwtMZ-rKnc8ZpmOsg-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=MMJrXb+PFcst+HWZFJy2pURo7XBZnh85p1BTZSd8Zaw=; b=KtBlPZxtJm0ykkJzJM2638924xL865GI6pUjQokxhazuQ0JshQG6/w0+che4OZ7+VE s2fWP72olwJT4jo8BBc80UIzvEpGWGGrlQWVyMg7S+5dY/dSTFr84kNeRmmQM7vjWcz8 dQzRSLCu/P18mTgU3zHHRVMZaQNK3S9+pqujDDCQ10z9aqETCswLp4tH8YdVTxrZKPaZ WD2wM6zMj0BDMePE4vepn4MPzb4A0W9Abr0r6an7ijPZSuiSPCzeaLlLDld7EJB2QZhT 57zAgIY9VSfFlSHAKddC7bSr5egYl2urj6JougYGp9q5o4MsBaYsnZqhmQG6lnGT86Rj RAKw== X-Gm-Message-State: AOAM532J12HZkee0ua0fVHGkphrzsc17j2UZx0PL0nzSBsHm/D+yEFNg vJGdJQEWGFsG05r330JGGw3G7Rg3LzdjCTfEAjVJWiQGsFkZZOMQoYTqYOomQ2qY4G+zg3hJBcR /RCgeZOtk/QZfPA== X-Received: by 2002:a05:600c:4f4d:: with SMTP id m13mr4522406wmq.31.1627395887441; Tue, 27 Jul 2021 07:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuE4bSib957DNFW9/g8fLZdVoDUnKyzOOKvoqS1O7Li7n97dr2AZ/o0zPFOTAVx4J5xyk+eQ== X-Received: by 2002:a05:600c:4f4d:: with SMTP id m13mr4522391wmq.31.1627395887334; Tue, 27 Jul 2021 07:24:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Willian Rampazzo Subject: [PATCH-for-6.1 v5 3/4] gitlab-ci: Fix 'when:' condition in EDK2 jobs Date: Tue, 27 Jul 2021 16:24:30 +0200 Message-Id: <20210727142431.1672530-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210727142431.1672530-1-philmd@redhat.com> References: <20210727142431.1672530-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: 1627395895782100002 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 Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .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 Mon May 13 19:57:20 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=1627395895; cv=none; d=zohomail.com; s=zohoarc; b=hYVvbfc3n5THt+DY+ZQr1nI04d48HHbn99CUkDa2hUW0diXd393qTKf8hLX6r2LcrnPsDjJIlaGBRfCFoP9xnfLS5LCTvI2gnoIzEoWw9nNOT0FMluh6UkuhpDGUCfgee2poS/cXl8ffAYxcM5YbCnrgqBtNQ3m7iumDNaKRRYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627395895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=5skV1VcH8VE4F7YVyHyIQxPMq2PPLQR3Z673qUopZ2M=; b=iYwmZasHx3iIO+8qq1jsCPtLZM0s7xei74zz/PiILO+MlA06+kNBt0kGgvJLttGKmBZFZXgoCrleoy/9eLFG5BgP5icmKXr5xI5YhmCwDqBCYVUbV1rcZKsWje1NCdHU5M+1IKsX5KGg5e6ZMaKE1nJv4g91qqhSzPL6/3rv+jc= 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 1627395895116466.6013374619074; Tue, 27 Jul 2021 07:24:55 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-x6HiB65xPfG3c6TZ51kDtw-1; Tue, 27 Jul 2021 10:24:52 -0400 Received: by mail-wr1-f72.google.com with SMTP id o8-20020a5d4a880000b029013a10564614so6071635wrq.15 for ; Tue, 27 Jul 2021 07:24:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id f26sm3570962wrd.41.2021.07.27.07.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 07:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395894; 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=PUMHguDD5oYYFjknj1KXms06VU61Qxd9+kczJg1z+reeCz82I4xKMbnMda3620M2/muM2v o+3ltlW9fySUesVjaHfM3DxKGYlELorJ10zGp+x6zrUhK4oLgCpWtLV/hDeQwip3ymQ+x/ U9MWsqXczx1rOHeFHqMlOqVv7BoL3pc= X-MC-Unique: x6HiB65xPfG3c6TZ51kDtw-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=O5oSFWVje7IgrArSJueVDQWC/3a4LjTPG5o0oUp63PP42aS/KhMMmgMBIg4CfudUUd w98pYnUx/41n7AOIH4aaoq7bVkFJUvyNSMsT9JpRsv1TXhxRTCeroxiqgDRH/W/uiK4n ks12RIYvYkfbeQZJW43Sdw9QrweF2C/odEHkTNIsCYu277jMYvKDRLniKJxEyPBNfrl/ sjbEBGz7jtLGDVmYFHgelu6hbE42f5CUUu6EYB89YaQLjPPsmMg+db39RAqQet+ICR9A YhylQ91fzdlVwKOS9VwtbELqyiHPmGjX7sVsBdHbnmly5YrcR3jvroJNXdH4hDYiX3PN COPw== X-Gm-Message-State: AOAM533O5wof1TOiuwq+IxJjsyQDJ5ddXCfAEvC60/qXjMEG9MASBO2W 6JjcCUeq/tv0Sl01vzWpVWoajf0r8q4fejVbBDHcFhn+7PL1ryZ3YzQg+vBaL33pixp4Nkjo1l0 ol0P5J9lhy+th6w== X-Received: by 2002:a5d:4251:: with SMTP id s17mr9858702wrr.154.1627395891803; Tue, 27 Jul 2021 07:24:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy58mqYnHRsuUNSk2O9DTDkT0ZtECoN18xtbcvhs3sMaVtjuZpC14erUuTv8PgRS3g9/MDewQ== X-Received: by 2002:a5d:4251:: with SMTP id s17mr9858691wrr.154.1627395891675; Tue, 27 Jul 2021 07:24:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH-for-6.1 v5 4/4] gitlab-ci: Fix 'when:' condition in OpenSBI jobs Date: Tue, 27 Jul 2021 16:24:31 +0200 Message-Id: <20210727142431.1672530-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210727142431.1672530-1-philmd@redhat.com> References: <20210727142431.1672530-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: 1627395895781100001 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 Reviewed-by: Willian Rampazzo --- .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