Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C0FBC63797 for ; Thu, 22 Jul 2021 18:31:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C998960E52 for ; Thu, 22 Jul 2021 18:31:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C998960E52 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6dET-0004Oo-QH for qemu-devel@archiver.kernel.org; Thu, 22 Jul 2021 14:15:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6dCQ-0002O1-BO for qemu-devel@nongnu.org; Thu, 22 Jul 2021 14:13:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6dCN-0007ZA-09 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 14:13:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626977609; 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; bh=KAIJUgYY8zY0yM6YT3eqRGZzrgWV1JgRzmtYyGxLMTo=; b=LDy6pfuQ8REG7e31pZbM7QkOBAVh4aVxxPAzdeziKrcEqfn1eq+18PO700M1u9F84SH9N7 PTYwHKQOk8rWC6jIMHUYUqkYMmRvc8PpVcbhCUiZ03pp8Rc4TFX+1KBjW2CT7HuDZSBgZV S0Nide8zhIKJavTtpPLz1jpFbzdm8Ng= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-_k0Yr3h_Nn6ugv5lqts5Ow-1; Thu, 22 Jul 2021 14:13:28 -0400 X-MC-Unique: _k0Yr3h_Nn6ugv5lqts5Ow-1 Received: by mail-wr1-f70.google.com with SMTP id r18-20020adfce920000b029013bbfb19640so2719522wrn.17 for ; Thu, 22 Jul 2021 11:13:27 -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:mime-version :content-transfer-encoding; bh=KAIJUgYY8zY0yM6YT3eqRGZzrgWV1JgRzmtYyGxLMTo=; b=EtMBbi7o3uSSC3wnmT+RGaFwT0FYFXxnE2sX32r/RFK+BbtlMfnKJyJfEAPgsCT3JY KVDNCbsSY/a/nDzPjsjCrNqilypgSAZNCa8+pm2klKX5DSk6pGyrFGINwRBnlKQnrGHR NWleMLXlK6AAt2OoZFUojlEE9byrwbVEUDoxGF1maCwTAqAKjRLTkw0q8LEzDIlfow89 xBHzZVQCLRz5i8i9O0NKmRcHH8CO8XsZujEYPq8zWLNAwHbeT7UcvDjvCERb0ITMRpu6 zhDTj4VYwGmcrzA4yuE2nXoQ78GmzW8v9bQnWmk6Wr+0qc5hGjzKUon6tumOE+1oNauP 9rUQ== X-Gm-Message-State: AOAM533N+kJNzjDtT8mTYHm0cOHcePF2lcajCmqGDQEWfeuJa9yIFc5S gRWIx0KEN5lagzujRQ75m7aJreP6CRe8eEnk5TGoavDHzDOPLYgfnCZlySE/j7WeW5ZvY82mT6h m0TYMLrFz3per+f8Upx7UIdGPJVEkJ19qvBubl7bvZaLTvZvXDN1yLyXziaFggY1/ X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr1314856wrx.114.1626977605656; Thu, 22 Jul 2021 11:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6Pql5bhIcjqIi2/NTgfTHJdGQWwyoqyiSFuldh/FBUU+OgSfVgRO1pB0o/ncL2K7WMpBr6Q== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr1314832wrx.114.1626977605456; Thu, 22 Jul 2021 11:13:25 -0700 (PDT) Received: from x1w.. (122.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.122]) by smtp.gmail.com with ESMTPSA id n23sm25627903wmc.38.2021.07.22.11.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 11:13:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.1 v2] gitlab-ci: Extract OpenSBI job rules and fix 'when' condition Date: Thu, 22 Jul 2021 20:13:22 +0200 Message-Id: <20210722181322.516635-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 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: 8bit 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.472, 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=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Bin Meng , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" First, 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. Second, 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'. The problems were introduced in commit c6fc0fc1a71 ("gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries"), but were 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é Reviewed-by: Daniel P. Berrangé Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daudé --- v2: when 'always' -> 'on_success' & reworded (danpb) Supersedes: <20210720164829.3949558-1-philmd@redhat.com> --- .gitlab-ci.d/opensbi.yml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index f66cd1d9089..5e0a2477c5d 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 + when: on_success + - changes: # or roms/opensbi/ is modified (submodule updated) + - roms/opensbi/* + when: on_success + - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi' + when: on_success + - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI' + when: on_success + +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 -- 2.31.1