From nobody Sun May 19 17:42:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1626257417; cv=none; d=zohomail.com; s=zohoarc; b=kqLEl75WikYwYq2ZRqjwnojaOxNfQvOQjrWbtqtv86mXMu/RIOCC8Z9hC+rCqcNHxEYTFyRqe6xIVMOI2zTVQxFlbk08yoOdCsMJhLCBBYxZKVzyampGYeB0645YrgqxTAPj2fC+mTYe4eOgcJH6g+Y2AveABgitX1i/aOzHvtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626257417; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=Vyd+6HDFGcy8sZRjZEqCf+E1DjJMv+yVb9TJMeBMPrc=; b=lz6ebZvgOJwWd60YhPtSUQ5aktBh2VFJNnn5TDN2K3s3fzBMn6UXiY/hCP4WmqdSfdcrST8Ovz1bj5621iamxfWSyxotp9M8WE/bSksOHH7xcmHkyebS01w/Y8UjBVH26aS/9EFA69IM/x+LTlpRaxjrqYMP9cW99bGz2tpdcQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1626257417702473.3276119159175; Wed, 14 Jul 2021 03:10:17 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-nBng7U50NH2GW2yTHuamzw-1; Wed, 14 Jul 2021 06:10:13 -0400 Received: by mail-wm1-f72.google.com with SMTP id p6-20020a05600c3586b029020b46124c2eso1800481wmq.1 for ; Wed, 14 Jul 2021 03:10:13 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (abayonne-654-1-142-116.w86-222.abo.wanadoo.fr. [86.222.93.116]) by smtp.gmail.com with ESMTPSA id c125sm5682385wme.36.2021.07.14.03.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 03:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626257416; 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=Vyd+6HDFGcy8sZRjZEqCf+E1DjJMv+yVb9TJMeBMPrc=; b=XUAfTQAi3BKZVE+FAK3jQ1a6ZXFQJu/JZfKugLPe+5OGO+dYbRgsrZ8g73S1aeTL9xRarP X8USbT4whfLqOdIGnv3uhPa0LoMBliVnuCHEiiGlVcjv4GZbWyamaYW6viIv/VdKTeJAC/ diGBprpA5u6Y4KsTeJJuiKm3S0laNag= X-MC-Unique: nBng7U50NH2GW2yTHuamzw-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=Vyd+6HDFGcy8sZRjZEqCf+E1DjJMv+yVb9TJMeBMPrc=; b=eeUhY9HSUhEAa0UnfQRjGN4Id9cGQ7lBJRcg+bcuvUg87f32ULvHGDMuVRtUNgn38I nsYUiLYeBkkmW0qRPBIGTjAtyRtG8nTsMLsNyygK0wuYSMc5ITGl6KnHZRyc4kpBDb96 ldef6eyZ18ISDedPaT/JMkJ138yti/8PqQIh3GChg5PrDkXrIoPH1gQu9EyEZ+PlwIAy bwo+AZAWV/toZYbOhd0FBwyLA2Z64xclaYl8sZD4kbk+wpn880HRo2j6NLmR6LNCs5jD okeVtvPoPV+CK9EDZlkQScH/rCVoh5Vb7c0fJeWFooI971bu1bMHH96D4uJKUvnBSp5p GYPQ== X-Gm-Message-State: AOAM532XBIq4xr0uY8Jb2KSnyFtlaEV3kScu2Z5HHtsM6ZmF/us75FRP 0rVzxdDx1DyceyTrGB+TQbbnPU37KcIgRZmtVQJQaXjR2r8lau1g1AOzANqqyRghYQy/PwpXH08 upDYn5yKfIWoZWg== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr11906617wrp.351.1626257412304; Wed, 14 Jul 2021 03:10:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcsI9+XGRFqvz8P1Exo2NiGXsdcWcI99+/OCQqNDzQ2aIK5KTcBYgiIw4VhVn0crnMqjLMqA== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr11906581wrp.351.1626257412150; Wed, 14 Jul 2021 03:10:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Willian Rampazzo , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH-for-6.1] gitlab-ci: Extract EDK2 job rules to reusable section Date: Wed, 14 Jul 2021 12:10:03 +0200 Message-Id: <20210714101003.3113726-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: 1626257420057100001 All jobs depending on 'docker-edk2' 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-edk2' and 'build-edk2' jobs. The problem was introduced in commit 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries"), but was revealed in commit 1925468ddbf ("docker: EDK2 build job depends on EDK2 container") and eventually failed on CI: https://gitlab.com/qemu-project/qemu/-/pipelines/335995843 Reported-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Willian Rampazzo --- If this is a correct fix, I'll send a similar fix for the OpenSBI jobs. --- .gitlab-ci.d/edk2.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index ba7280605c4..aae2f7ad880 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,10 +1,22 @@ -docker-edk2: - stage: containers - rules: # Only run this job when the Dockerfile is modified +# All jobs needing docker-edk2 must use the same rules it uses. +.edk2_job_rules: + rules: # Only run this job when ... - changes: + # this file is modified - .gitlab-ci.d/edk2.yml + # or the Dockerfile is modified - .gitlab-ci.d/edk2/Dockerfile + # or roms/edk2/ is modified (submodule updated) + - roms/edk2/* when: always + - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts with = 'edk2' + when: always + - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description cont= ains 'EDK2' + when: always + +docker-edk2: + extends: .edk2_job_rules + stage: containers image: docker:19.03.1 services: - docker:19.03.1-dind @@ -24,16 +36,9 @@ docker-edk2: - docker push $IMAGE_TAG =20 build-edk2: + extends: .edk2_job_rules stage: build needs: ['docker-edk2'] - rules: # Only run this job when ... - - changes: # ... roms/edk2/ is modified (submodule updated) - - roms/edk2/* - when: always - - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' # or the branch/tag starts with = 'edk2' - when: always - - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' # or last commit description cont= ains 'EDK2' - when: always artifacts: paths: # 'artifacts.zip' will contains the following files: - pc-bios/edk2*bz2 --=20 2.31.1