From nobody Fri May 10 13:24:38 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=1626977613; cv=none; d=zohomail.com; s=zohoarc; b=fMdctb9htmRv0H94LtS6xyrWwoVfm3tvJ+w0vR9BkByLRyXC90SZhcf/+KzJ2jEuiMnnPuy6Wlr6CDcgtm1cKcKgGxhBA2kgrjVVIJvoyUFcjiwDaqHMm0oaMAWqL89paSKRWI7JpM6oCp+8sHEBhIKWlWgoBxjP25g6FIZZ7xQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626977613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=KAIJUgYY8zY0yM6YT3eqRGZzrgWV1JgRzmtYyGxLMTo=; b=B+IVanKcikJS68BsUgWfs3dAyc4KFzytipfAC/adttjtkEet91/eALx8OIbNpA1OphZ/oo1m2dVhgcsLkvNwVUCkbdcui/RB1IvqID37i6/7rn7/Jo+s23fS4Wuy/FPpZnO8uJiPb2ks0P4yGW7rkq5fcjBg+P+arkjNK7XJ/is= 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 1626977613359790.5984229072519; Thu, 22 Jul 2021 11:13:33 -0700 (PDT) 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-585-jasUk5WBOQKGCDLYgSOZGg-1; Thu, 22 Jul 2021 14:13:31 -0400 Received: by mail-wr1-f70.google.com with SMTP id k3-20020a5d52430000b0290138092aea94so2732543wrc.20 for ; Thu, 22 Jul 2021 11:13:30 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626977612; 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=VcUuvoZrlYjHgYBDeCMCgeo9DMbMliqtbx0ymY81Aui7TXO99NWKUYiZLjyDBDihWgttrL 5uHcMvvcGT2sZblaWqE1VHZup7SI2ciciINFvD5G/tQ6Qy3bcr0Zwbfcawd/XrmHYJN2G1 JT/7CjvZGKnr6KLXZm24CpiLUAEqAKU= X-MC-Unique: jasUk5WBOQKGCDLYgSOZGg-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:mime-version :content-transfer-encoding; bh=KAIJUgYY8zY0yM6YT3eqRGZzrgWV1JgRzmtYyGxLMTo=; b=j0oEY0P6xrVJzow3pQV3tnjqSxDHmUSdHi/cTiq0RiJFxCoZIqOcVkgpv4qqtrR9O7 RwXfyLM+SDUJGIgTFbIAD/GQrv5I9LJQ6ZjPkFO6GATk2FzHMLYXp5pE2qBKv4QLVGlL EvF+6jqr6qiLtaY9T657kJGF3kSZmC6lbKWscIuauEgAWBglqY8HLUOhky96kuSIMbFC /x29h7XE4pWIOA+gTLCz8iALve/6k8E3IJNnFbcVeQrXsNj7bf4ndNInWc6zlZzpQ8hr DIkbLVnSWfqCq0TzcpuaKysrGxsprnWkP8Ds0fDH/2XmU99NFeS7ubSQwl+AjB/PnWIc GjUQ== X-Gm-Message-State: AOAM532hxpWfNuTpN9Qv2+DTvBRtgeU6SDsPLJ2Z/ETDIrJjc/bmUym+ etmkRw/ERPeDuQchqhDSuIe9GKtUQErBA9PMtK/F2swP0Yi7eHjs9orU6a+9DnxWOJlK9oZdiiM vz7TQma0Bb03P7Q== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr1314845wrx.114.1626977605628; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , 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 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: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626977615423100001 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=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cleber Rosa --- 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 =3D~ /^opensbi/' # or the branch/tag starts wi= th 'opensbi' + when: on_success + - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit description c= ontains '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 =20 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 =3D~ /^opensbi/' # or the branch/tag starts wi= th 'opensbi' - when: always - - if: '$CI_COMMIT_MESSAGE =3D~ /opensbi/i' # or last commit description c= ontains 'OpenSBI' - when: always artifacts: paths: # 'artifacts.zip' will contains the following files: - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin --=20 2.31.1