From patchwork Thu May 27 16:03:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448862 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp644711jac; Thu, 27 May 2021 09:10:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOsQdeJFfrJQrIxg6qaUbXJ9ypmAQntFDyhOpMH+KOFK7jxpLxqt0RCo97U+ExvnT8Pvyb X-Received: by 2002:a17:906:110d:: with SMTP id h13mr4478447eja.45.1622131819571; Thu, 27 May 2021 09:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131819; cv=none; d=google.com; s=arc-20160816; b=hVefWkDNjDaEfZwBR52tb2YTSMync/1zlZx8tYNiY5PXKkpG2QeicIEa17lgmjFz3n XHZD2Kyao2Ia+505sc+hfdZa/0oVhKfCiqzXmSS1QgHKfF2vYrDam40lzVkn3q51PCCT BQHFsOm/FXZDuYKtgm1nOP+JCIqHOXbfWeWBRAB4g1Elm/YiGz40kk5x8KhZyahRA0Gp /hIduQB1RbjkZOi6+eLd2b0gjYD9WUTeaZzk3Via16bVWvlVO7HBRRKg+Ac5w+TewIYo ntImgf3TFLh2YHJb+65I/3WqXmio7mHCgEPohbugy6uNfpfB6JOhCFc9DDu35WRfPVs4 L43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=ZvrR1j+fB5jV9IUc9AI57L8kElSuKg/8PdQt5sSpDRBiqBiCQOOaZ+Q3iyNmfk/2WI CbUDKDbscQt/jb0TKEPYDRAfunEbRnE5XT2Cc8ro6NjRetxd9bPPrH8XM/hdjDskjfBO fWnaMnN2przga43/66Yro23R+gZjuqXDyfM5iF9GYobdI/TUXsoBlPHYxs192DEvG2se pB16B2FHLfCqWSW+gSzWdJYz94DiTuIRne6jvypgUYBwQkEVBRqF6Y7N8Uy5b5u+XHNo f4Ba8X03ekRJ60X3cSbKgtv8yyo0evQHvEGFzeakSLbUnkhCyXaqmL00P3yLUBgpe1Md sTyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="NnEFB/X/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p18si629010ejz.187.2021.05.27.09.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:10:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="NnEFB/X/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIaQ-0006zh-Jg for patch@linaro.org; Thu, 27 May 2021 12:10:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITs-000506-BE for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:32 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:37543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITq-0000MT-8S for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id f20-20020a05600c4e94b0290181f6edda88so2933599wmq.2 for ; Thu, 27 May 2021 09:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=NnEFB/X/fcKTDhMHep2ELNzyR4x4ffY269gNCX9Zicaib5ZJ6JcZLTTXPSbFidhL1n dxXiU62dNaXlP0T/6fklz4mfC/jkaZw+38k20fSsxf/J6+T4ifMAkaoUtJK9ke9gbq6I dWkvzVE8cUpn8/RsvXmJ0kgfkJrsAio9YI1GDhFUuuCDGyBlVMErEGdUBTVU0ej9FG0O Rw2zkcNzqyOQKZ63QlU+VktR1gc6KypBCGAx482AXOa3GMByoalO6DiACvg0KiNqJKD5 Mke4ynTaR/98JFlp97VHELcITE17R0RzEzeHzdKr9cp1z/SP5O+rXG6IhiIGBnae7J8A p3dQ== 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=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=KehHX1OMOzl7pgaz+JYje2bzRFx57LEFLuGzGsOQc4tTkkT/VaHa5ppCGIofRD8auO gKPhq8+k7sTGOzRfo/QFjUooOgAo/51ozOm8tuBPzq/DTU9RPbwgNj6xF1RgkerB8YLi IZOuvWtDZ29lpNowjN2OIuE6aH2vPGolr9S3Xn+l5aVU8+KvEc7Gdn74bWOYeTSmSFRI MXajGPMmLXBbxiVdlzkIpia+mV60mVtLVbzK0JSyN6MrtNU8F8r8mFn5qQRGbCD+08yH elwk/Kls+0N3O4j4KptPKso4tTjGuO1tCZ1Qsl8qWrKSfxS4AF/zEVtic8yywXiffCZX zK8g== X-Gm-Message-State: AOAM5336zV6NXTpK1sZQBe1xcQbyBe0557PV/OCzVkYcpqK+AKIid7Ae OIJVn545+bC9ajzlCoRyS7m9lQ== X-Received: by 2002:a1c:2456:: with SMTP id k83mr4287216wmk.87.1622131405503; Thu, 27 May 2021 09:03:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m10sm3672480wrr.2.2021.05.27.09.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C63501FF90; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/6] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax Date: Thu, 27 May 2021 17:03:17 +0100 Message-Id: <20210527160319.19834-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Per GitLab documentation [*]: "rules replaces only/except and they can’t be used together in the same job." Since the 'rules' syntax is more powerful and we are already using it, convert the check-dco/check-patch jobs so no job use the 'only/ except' syntax. [*] https://docs.gitlab.com/ee/ci/yaml/#rules Inspired-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Message-Id: <20210525132418.4133235-3-f4bug@amsat.org> --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c46392b2f..797403477f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -785,12 +785,13 @@ check-patch: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 - allow_failure: true + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success + allow_failure: true check-dco: stage: build @@ -798,11 +799,12 @@ check-dco: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success build-libvhost-user: stage: build