From patchwork Tue Jul 27 14:24: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: 1510513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AebDI7he; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GYzbZ4nC9z9sV8 for ; Wed, 28 Jul 2021 00:25:30 +1000 (AEST) Received: from localhost ([::1]:47522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8O1Q-0004s7-5u for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2021 10:25:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0l-0004ok-MM for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0i-0001kQ-7u for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395883; 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=AebDI7heBAtSmbkqb46IJ5DNyHusDdtfMes/ySGSbAw3JqqOdTAKvg85NH9ek/G/UAhpzw Qy8YH6YDPd8oHK+FLo/MgJnsmztPmXUsO3kAWmA+5oXJXQFsauN8q+IPrSW6illK6fU5xf zGL3Ur2qTh09ycfYhxnfZgFwZqmIjRQ= 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-560-mFM1Hdz4O3Gy1nphnfro2A-1; Tue, 27 Jul 2021 10:24:40 -0400 X-MC-Unique: mFM1Hdz4O3Gy1nphnfro2A-1 Received: by mail-wm1-f69.google.com with SMTP id n7-20020a05600c3b87b029024e59a633baso1438065wms.5 for ; Tue, 27 Jul 2021 07:24:39 -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=47FZeHkD8NUYnjKnwioEIzHdD7XGBpqWb+6R03bKg1M=; b=HKvDIi7r9zCln7cELZcOjEjqsCw6T0A+LTUdG8Qb4mDn5Gl2SbrYLms2IK1/lFhqkB U225mEXRHUzQeKJR+0TLId0cQbGvZMAWrO0ViQ032Rj7OkcDXmvBRKL/53MsDTA0xRN4 lQql1n0X5LD7l/r7rP/lkvA9EpqOyjLa2bzvkpPs5f6doCITYiUe/dB3VlkHEOGXxOBX GHhTDwAwVA2zV/cNMp5qzul/W//iyOzR6gb+zWJvVyomWyrE3aCsHU11fXo2RpQtFdQM BJir0EnmE7764KrdAJxS+6ZhXg6+Kw0Z/lBofGaPpSiqeR81TQ+B5VcSFJPt6kTizIGS frsA== X-Gm-Message-State: AOAM5333w8MFtIbikoEsUClC7P+OpQU3s3WbvUHZvcm50ng81V+9f++w MvBYB1xQHaOBp3DOpokhYwSzogC68rE7vLiKvrCV7ZywrKGWUmx4cH0SKXGtfjUikC9/UeTiCq1 GcKuxUuU0pbjH2JbOjCG/4APKxH+f7Slabcv/sP+ED6XlxKuUJd1o1L+427fAK8+V X-Received: by 2002:adf:ee51:: with SMTP id w17mr10237962wro.279.1627395878653; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Willian Rampazzo , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- 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:: https://wiki.qemu.org/Testing/CI +Custom CI/CD variables +====================== + +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="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 Tue Jul 27 14:24: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: 1510512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Psu5dcBT; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GYzbY4YXfz9sV8 for ; Wed, 28 Jul 2021 00:25:29 +1000 (AEST) Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8O1P-0004r4-Ad for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2021 10:25:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0l-0004oW-I5 for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0j-0001mE-UP for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:47 -0400 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= 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-408-PFsoruJqMa2FCgFNKYKK9A-1; Tue, 27 Jul 2021 10:24:44 -0400 X-MC-Unique: PFsoruJqMa2FCgFNKYKK9A-1 Received: by mail-wr1-f72.google.com with SMTP id u11-20020a5d434b0000b029013e2027cf9aso6036013wrr.9 for ; Tue, 27 Jul 2021 07:24:44 -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=I3f5VWr0dv08m9hk8YYT+1REocG8ozdjKKxl8Jc6Yx0=; b=AYZveggjifL858dpXi5gKVBLKjSDdTwdfCAkUSzlDMhYCAIPfnRAUZXDakiM1A69g7 LgAIWEZLxqrIE56yIE8/6Fxm/izCryjyEaigIX8jVAkMZm0vnA9SVebC8IjiikMp7y3o BvDqsVBJCsFtIXLgu9pT/rPUIB0oodxr3sTipWhelAGpv7AJWUAsksd9Z2aXT2k9WZL6 CwcbWfnL5DJCiqi9hWLh/Z8OUK8D5meypwCFJfI9T8DB6Swff8ZP4W3FeQgyoOcKRTEv 4+O+VDTTz5Di2jcFFpSqqzglOrxayqq7EgbUmpgz8lL29gYGN/yi/3eIHP31EprLeINp 6Q9g== X-Gm-Message-State: AOAM533gMMkz0EYXk8Rd7Dw+KWKzsv3fRkKeeVsi4kg6dW0OdTpyj8jv Yk4DLvzzY0ty2uOqCJpqaLjD1qNgctwHx9IbD5KelN81jsjS2pPN+kZz1r6hD6LSl/Z3pqaKUw+ 9K0j3VfkizRAaD0yrUJqDhZU+j2n5F3HsD7hztMLA3+okDQC+rw4xx2NSxCjbMbsv X-Received: by 2002:a1c:a510:: with SMTP id o16mr19672132wme.176.1627395883051; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Willian Rampazzo , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- .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 Tue Jul 27 14:24:30 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: 1510514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GpC8UCdt; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GYzbh3Mx0z9sWS for ; Wed, 28 Jul 2021 00:25:36 +1000 (AEST) Received: from localhost ([::1]:47956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8O1W-00059t-5G for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2021 10:25:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0q-000537-Qy for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0p-0001q8-6Z for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395890; 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=GpC8UCdt8VSk2qbzfDEIWNRswaXed5sHT+gDYGzuc0Ukq631jMV32i//LQlY+MXiV7YP5I I0SEIImabQ70m2pcG82ZreqJlbNlkOyTrGARc3l0thYoH5p86SjWIRpLs0Gj0zwP2n7INv YJ55ZFOvJ0mWLOTvcwWROJxuZtVi7mk= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-vNoKblgfNcGuOQa5VkaEyw-1; Tue, 27 Jul 2021 10:24:48 -0400 X-MC-Unique: vNoKblgfNcGuOQa5VkaEyw-1 Received: by mail-wm1-f70.google.com with SMTP id k5-20020a7bc3050000b02901e081f69d80so1042154wmj.8 for ; Tue, 27 Jul 2021 07:24:48 -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=MMJrXb+PFcst+HWZFJy2pURo7XBZnh85p1BTZSd8Zaw=; b=kqu+CedMEJ9PN/FbN8Q3eypbfW8iBmpWo/I4nyunPX1xFuOonaEQFNKpYwt0tTZ24h quge2bY6+viLMbipxkenqfCfjA8lvM9e+bp0KGCk0/qcjg7yvk5ulAu08R1qvRya2WVA af/u1sVxhN6lpZABmA4l/WaihNTrI9KiarZvB2KxMlTK1sOJ+2KDBv3Ipnts/FBcyEYi NQVFLNz3CKvKQ2qUA5bUwpWNgRTnGH4rq/+ZGGyOfyp1fmunbEfXtqJMugyF5L3nyEDC ZqkXZSHn6cDwSV2g+t86VUCjiNhBvL10E2Dalh5BTPAg49FnXfqJFFT9ObElGWLOI3XF i4MA== X-Gm-Message-State: AOAM532hb44fCkMNGovSIB8xXrP43V7Vz8iFyohIPhrjiztIQn2pj/Ql /kP84qRSCYNxiddRxoCYoDScWrlSxWb53LBuGoVGChbAriGQUEJ05Ej1d0HEqf6owu7JnegZgeL Dm/2mc2DWGyOcd1QIwOxgjb05SMRtfdKEFLQFtHwTq0vELQG0CbHqqORlWpKBJDmn X-Received: by 2002:a05:600c:4f4d:: with SMTP id m13mr4522412wmq.31.1627395887478; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Willian Rampazzo , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é Reviewed-by: Willian Rampazzo Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- .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 Tue Jul 27 14:24:31 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: 1510515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z2UE5qYX; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GYzdM2b04z9sWX for ; Wed, 28 Jul 2021 00:27:03 +1000 (AEST) Received: from localhost ([::1]:54510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8O2v-0001Ez-5P for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2021 10:27:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0w-0005LQ-Oe for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8O0u-0001uG-Rk for qemu-devel@nongnu.org; Tue, 27 Jul 2021 10:24:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627395896; 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=Z2UE5qYXVStv7oyCTZVYZ7MxrHh05zeikV7x2O0i+zqO+9iXjuVMzsyTUjInwlBB3t+ua3 bSmgxF2NQqrbnQH28SQj99vZtnJPHQJ29HqkAtUUiwUmTqea0sonOj/ZjJ0mqu3uxiR5Jw S6WKp4kG2VpdcDA49ch3C4sdMgrmWZ0= 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-265-1Z8wL4xmPIC1hAbBn8xvQw-1; Tue, 27 Jul 2021 10:24:53 -0400 X-MC-Unique: 1Z8wL4xmPIC1hAbBn8xvQw-1 Received: by mail-wr1-f72.google.com with SMTP id a7-20020adfeec70000b0290140ab4d8389so6105787wrp.10 for ; Tue, 27 Jul 2021 07:24:53 -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=PiyVCvQz4IrkRNMMXwUeIFRCZCSFxK6x1scpTrJUnRbbItkUSdJ3H6bqAsdjGF50CD Pox6p2/3kKBbXvHLehMnGDKvS93TxbtpA0n/0+LFGqM1PNCyiSOUbIe+QqvgTyMrHOe/ 5Un4xIbwn8bVHZR1hSrnXT9CoDCFRgMPUQtzwWLU2xhU1SgZffvX4+TzC9GZkysieHMy +GFV+ShC+vMFRj9kqau/yAciRJsPItRrQPG7k/zi37KGEWdu2KT9igsGp6cwpKyZc79S BOvP7c4JBveQPDgAoYnxWW54FR+1K8ieygaTcA6nJBAbUu2n/uNDF1iq8rH5gY49u5SL XGIw== X-Gm-Message-State: AOAM531NDKjSiayj77JeSYkT5NUuExJwkk1rml/JgXmT9lXxvxcAUPhu h5NZOupG1Dz6LseG9m60tkA7UWnY6vsXXOMLw4xL5tRThtugEbOIIxDnwTAo1lBb51OS9eccba7 c52p5ZugB3COAexM2IAA7LCvYRxtYHyCASvTm6CfC1B0qZ0VOXYbNLDFHhKPPZ0or X-Received: by 2002:a5d:4251:: with SMTP id s17mr9858711wrr.154.1627395891832; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 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?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Bin Meng , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_=2E?= =?utf-8?q?_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é 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 =~ /^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