From patchwork Tue Jul 20 23:27:03 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: 481703 Delivered-To: patch@linaro.org Received: by 2002:a17:907:d92:0:0:0:0 with SMTP id go18csp6020773ejc; Tue, 20 Jul 2021 16:54:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypVdclqcwErN04uZccwUkbY2UpjIkRdgMN0vCqNL4j1rIsuxWKM/jB/1SLfBYrMt5YMwHZ X-Received: by 2002:a25:487:: with SMTP id 129mr42711660ybe.0.1626825248579; Tue, 20 Jul 2021 16:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626825248; cv=none; d=google.com; s=arc-20160816; b=z3uwbpj8iwPbIRFp4tYVgdewd8GXrYw2jA8HqpFLWjXzxafgj9DmzE16q8CFhty4pn MMMKwrgQ47RgZ5zaTsN9L5NYG9l/wniDStcUaVdigHW4w7Mvwgc3sQrORglfJ+K5phr9 re8ThQWnsUt6EqK8ng8gkx5Y2sldbQvd7RCsFGD5hjmWxsxosqr04chY31iJEpONoEXh QHSBvRn1ao7op7vTY6WHrVuFMENWNr+2WdfWAXNCcyEE7ffU0eOQoyWYJ8xDi2wIMv8Q cLmsQfve45zA2agXuESbmQ0mrk/r0YjALYbj74VYBw9ALz9/war3PfimNJb7yzQNB4PM 0dKA== 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=e6HXaeadufTGc/jHjJoB/6ewRfmrNCAr+yGlUDq0TRk=; b=IHkMu29Z4RyGnsUgL6NPVAuDiQGtYgOxgJghJ1QyivZzfnOCPFzZ9dD6H0B3ceHhAy z1FaZ20I2vJbxsLFUnusrO1bwbWltpeIKpM/mr89wQoqHbPUwEZ6GyKt4QVfjskRoS/S gmI8ZuyO84rDe2Bs9huUjERUJ9fNNhebSyAkp+5tA6OA/qibZA87A9XWNCDbkyGzlad0 qQGUKsOtRZrP0SDfD5DNbdFjC5Y6kC8iFXYG5pA/5Sp/GpnaI/5ya9fijUm7WQCNHaqI 9c/7xp8Hn7IRjbpZCraXA6pz2Fv0huOkh5YtGX1tRHvYD0OA7FNUlAoqmMU01ul1jd0L IWbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=McCdR4Ne; 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 f72si21467444yba.492.2021.07.20.16.54.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 16:54:08 -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=McCdR4Ne; 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]:48572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5zYt-0007xs-WF for patch@linaro.org; Tue, 20 Jul 2021 19:54:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5zPV-0004tL-G1 for qemu-devel@nongnu.org; Tue, 20 Jul 2021 19:44:26 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5zPS-00086s-50 for qemu-devel@nongnu.org; Tue, 20 Jul 2021 19:44:25 -0400 Received: by mail-wm1-x32d.google.com with SMTP id n4so311543wms.1 for ; Tue, 20 Jul 2021 16:44:21 -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=e6HXaeadufTGc/jHjJoB/6ewRfmrNCAr+yGlUDq0TRk=; b=McCdR4NeM9p61RbOPhJXh/VlWuePg8fu/owQa0TrF37pEUeYMR0rgvX0b4JrNXVWbR 1JWAf2SvbnEV75uraJ0c3SR3q8XYlMCpG3zvKLgCqH3guYwdflPH6g5i65okdQmcXxqt lpe8hFj1Zw8IfWOGbV9940igvyekEdm5cR19zxXRMm9Rukmbd5eF3UfIGntmIB4Dt6fO p0vdhOkq+yxfej5zVwMhFF3rCUrRzier0rqm8gFJR/SCMA4dFzcEheNoldGH16Wn3Je/ 3OvGGXLaw6Zg13amyhqFwehCFsvPhwZ7BH4t0u+kY+eY0yM63aW8IbbsnG9HhSv9IsSg lm0Q== 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=e6HXaeadufTGc/jHjJoB/6ewRfmrNCAr+yGlUDq0TRk=; b=tGayK0hLr5MNG+e9DmE7HxL8wqVbjvW+KzcH+4Ycq+BDjDG8+TardZIfHvLZbFQ90z U/JhRESfF0BLdFVdb5Ze3JY1DNPkFi7AoIdrBlVTlUoUp/JUTy3F5BpLneqbNni0Z3jp 8PH7+zEicJXOLKGERPoP8b1CLJAmud2FKSpJe8qdTUTTj3QGxVC6p8sigXdmOHzBWwBv KsjSk8909voSETNCQB+4xP7J9u2Jg4OnSnDRovKMi4LC1Xky01CeqBvAv3/rtrlkJ22E FcpahoSoMVrMPTBFf1PHYFs+vvMdbkpU+dRNZyQF5lplh4X/oK7BM3p+dMJTFxDApiz6 DlTQ== X-Gm-Message-State: AOAM530VOdLp3v1Y4w5f5JiD2kYCK6+k26jFi0DHneWoE3mQgjno5gvI TY4+kQCgAuUEeGva6DrZkZypRQ== X-Received: by 2002:a05:600c:198a:: with SMTP id t10mr989485wmq.32.1626824660574; Tue, 20 Jul 2021 16:44:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm3669283wmq.31.2021.07.20.16.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 16:44:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F5D41FFB4; Wed, 21 Jul 2021 00:27:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 29/29] gitlab-ci: Extract OpenSBI job rules to reusable section Date: Wed, 21 Jul 2021 00:27:03 +0100 Message-Id: <20210720232703.10650-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720232703.10650-1-alex.bennee@linaro.org> References: <20210720232703.10650-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé All jobs depending on 'docker-opensbi' job must use at most all the rules that triggers it. The simplest way to ensure that is to always use the same rules. Extract all the rules to a reusable section, and include this section (with the 'extends' keyword) in both 'docker-opensbi' and 'build-opensbi' jobs. The problem was introduced in commit c6fc0fc1a71 ("gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries"), but was revealed in commit 91e9c47e50a ("docker: OpenSBI build job depends on OpenSBI container"). This fix is similar to the one used with the EDK2 firmware job in commit ac0595cf6b3 ("gitlab-ci: Extract EDK2 job rules to reusable section"). Reported-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Willian Rampazzo Message-Id: <20210720164829.3949558-1-philmd@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/opensbi.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) -- 2.32.0.264.g75ae10bc75 diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index f66cd1d908..d8a0456679 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,10 +1,23 @@ -docker-opensbi: - stage: containers - rules: # Only run this job when the Dockerfile is modified +# All jobs needing docker-opensbi must use the same rules it uses. +.opensbi_job_rules: + rules: # Only run this job when ... - changes: + # this file is modified - .gitlab-ci.d/opensbi.yml + # or the Dockerfile is modified - .gitlab-ci.d/opensbi/Dockerfile when: always + - changes: # or roms/opensbi/ is modified (submodule updated) + - roms/opensbi/* + when: always + - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi' + when: always + - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI' + when: always + +docker-opensbi: + extends: .opensbi_job_rules + stage: containers image: docker:19.03.1 services: - docker:19.03.1-dind @@ -24,16 +37,9 @@ docker-opensbi: - docker push $IMAGE_TAG build-opensbi: + extends: .opensbi_job_rules stage: build needs: ['docker-opensbi'] - rules: # Only run this job when ... - - changes: # ... roms/opensbi/ is modified (submodule updated) - - roms/opensbi/* - when: always - - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi' - when: always - - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI' - when: always artifacts: paths: # 'artifacts.zip' will contains the following files: - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin