From nobody Sat May 4 02:32:18 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=1605010578; cv=none; d=zohomail.com; s=zohoarc; b=jqyob6XsJ4ddaLVVp4y+zQukbfLlDa7b7uztHrvyUFpty3JDjPI9AKYDkJl8IO1BE0LEsx1loKSI4sjCommFqmVmzy28Da8rOkPs2EBeYa1ew0Xl1U2dmx5C+pgPyQlMrIHehzK9At0DDqQz870Yi2GOvMHfDcRLRQYRFqVOUKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605010578; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hHoxmp0GZU/YhZXxlfHMYBwFYW7GtaO/Gi2jra08+tw=; b=WCsLlEpU2Wt0LBCL4AudcdLnulgwPK2OZ170qHD31U2yB09DpSRHAUrf5LGGZZjunyhtkGrr+cPTtuYRnMgVo4AM3YBs3/Z/u01Ur/bHviSl0fS+hV5rJZTjzftvZY32Rsso09FnbkTl0Lqy99Rl+KxNzmn+oR1c3Jc7lKOEveM= 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) header.from= 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 1605010578634497.4976434861626; Tue, 10 Nov 2020 04:16:18 -0800 (PST) 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-309-BD2gF3wyNzKoCx13B3AxMQ-1; Tue, 10 Nov 2020 07:16:14 -0500 Received: by mail-wr1-f70.google.com with SMTP id q15so5627265wrw.8 for ; Tue, 10 Nov 2020 04:16:14 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id m20sm19094724wrg.81.2020.11.10.04.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 04:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605010577; 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: in-reply-to:in-reply-to:references:references; bh=hHoxmp0GZU/YhZXxlfHMYBwFYW7GtaO/Gi2jra08+tw=; b=WJj7LGhA2OIBwQ5N/H9ZaR+XV/qKhNoGqhN9VB+mH639OxbYqajik02JqPrzDkaU2yxfxc wkvvPW97rKt0zZc+gd+F3s6v1hTyoYjjHqHl4bsF4b3dK1XNHjJs9HZTuGMMhqZDhO/6+y F6Rc6cMumL1yiHFWz/wp8f6ZZSITw2I= X-MC-Unique: BD2gF3wyNzKoCx13B3AxMQ-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=hHoxmp0GZU/YhZXxlfHMYBwFYW7GtaO/Gi2jra08+tw=; b=tl0T3iRdML0cn675E7O6ogfnAjndD4hjVh6sTITuyd+BHepM9wKShLEYN12qzSWycl J3M8ayf8sZAShf8cb1oCoLp3TTwTqOGFzqj2lJi07XniBKl+Ux0DTDmjToEQ1kr07Yso jYZFVtTMWFkTwGgt9qHVeJZAobXHHi7GojpqoFegF9vSYc80ohzULlGRMVIHxoNc3f1g LtmLx/DV1Ws/dezJIAhhkj50SyYrTf+Nc1RBw+caPCDyt+ozcnItKULrQmETVTVN7ovi 2Il47ZQyJd8xJff8MjIeVW7jaLxOu+hGiwxGP4+PWeWqJj6JpddgkqYd9r/jobz3Dt/L kktw== X-Gm-Message-State: AOAM533JxCNmGOuACpfN74YIN8mnVKdwM+eN/+IboUBIyDdOZK4VeYWm FkY6EjbNs9uXr67Jdf1yMlKBRY9lySP4eVCj6+G87AX/Q4aOQ1sorSqo63HOaNGbJGhuW1d/W7K 6Hcl/OPzbAVRpTw== X-Received: by 2002:adf:a29e:: with SMTP id s30mr25356984wra.29.1605010573469; Tue, 10 Nov 2020 04:16:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPLOKNs2QqlOodBTN6XxGjPm4TJ1PcbW1fB6nw1uT2dItJxTOHNGG+uqmqHElWl5rp0d+YLA== X-Received: by 2002:adf:a29e:: with SMTP id s30mr25356969wra.29.1605010573330; Tue, 10 Nov 2020 04:16:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , Thomas Huth , Laszlo Ersek , Bin Meng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 1/2] gitlab-ci: Avoid running the OpenSBI job when not necessary Date: Tue, 10 Nov 2020 13:16:05 +0100 Message-Id: <20201110121606.2792442-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201110121606.2792442-1-philmd@redhat.com> References: <20201110121606.2792442-1-philmd@redhat.com> 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) The OpenSBI jobs use the 'changes' keyword, which "makes it possible to define if a job should be created based on files modified by a Git push event." (see [*]). This keyword comes with a warning: Caution: In pipelines with sources other than the three above changes can=E2=80=99t determine if a given file is new or old and always returns true." In commit 922febe2af we moved the YAML config file from the repository root directory to the .gitlab-ci.d/ directory. We didn't respect the previous warning and disabled the 'changes' filter rule, as the files are now in a (directory) three above the YAML config file. As this job doesn't take much (less than 1min), run it by default. [*] https://docs.gitlab.com/ee/ci/yaml/#onlychangesexceptchanges Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder= ") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/opensbi.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 5b13047e2ab..b1fa244fda4 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,10 +1,5 @@ docker-opensbi: stage: containers - rules: # Only run this job when the Dockerfile is modified - - changes: - - .gitlab-ci.d/opensbi.yml - - .gitlab-ci.d/opensbi/Dockerfile - when: always image: docker:19.03.1 services: - docker:19.03.1-dind @@ -25,14 +20,6 @@ docker-opensbi: =20 build-opensbi: stage: build - 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.26.2 From nobody Sat May 4 02:32:18 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=1605010582; cv=none; d=zohomail.com; s=zohoarc; b=FNsP1eSuq8+VxjVG6tw5C5Fd0lkSv6JvirXAHFK++aRxHARSPCOJv1lE5nm3WZBlgPzK+7xncqbjWVVG80lHpVzx8pFyj+EmzxwEGsAGHBEvorfGzbM+68MM2R7D7aKZIlTo9ZVE/DmkEnmcpS102Rwd5Gg/b9sUo9TWy6ymEbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605010582; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XIapllf2s1hNvPQA26YFSp/VUewIvo86tU9zFiFHkGY=; b=fg22sgV8TRAcoXZ/6L3eJDBmR/qK05p/1VB+KW44rN7KtFEy+z2B5tY79Csxy9IujA6mYSmhWsw1Ew07w1kMpoNIuo5bDLpimvyD3VSNHLuyonitiQ+28M271i+tvLelmU4Cxz0Wx2Snu7ZCR3Bxq3vl4Uq9xhIBnKcjGkdqdh8= 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) header.from= 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 1605010582223222.87330388226314; Tue, 10 Nov 2020 04:16:22 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-K4ZYjPg2P5yf3A8Zn1dKxA-1; Tue, 10 Nov 2020 07:16:19 -0500 Received: by mail-wr1-f69.google.com with SMTP id f4so2582038wru.21 for ; Tue, 10 Nov 2020 04:16:19 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o7sm17601726wrp.23.2020.11.10.04.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 04:16:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605010581; 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: in-reply-to:in-reply-to:references:references; bh=XIapllf2s1hNvPQA26YFSp/VUewIvo86tU9zFiFHkGY=; b=RtQ/zirokfAa1B8Rpl4yuSMXC2oPr4qSGSdmcBi+NDRAfMBr0tKVsvxOXg/k+NPUB+SjW2 c8a0tVb3Zl6S0Xyp5KRI7eTS8s2Db1j5orY0trdgNjhE2Q84BqdD66j0hAdGRoi5nKrMQq Ffw/9ioS4TNeGs2RfoqNF3nN5JXT2RQ= X-MC-Unique: K4ZYjPg2P5yf3A8Zn1dKxA-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:in-reply-to :references:mime-version:content-transfer-encoding; bh=XIapllf2s1hNvPQA26YFSp/VUewIvo86tU9zFiFHkGY=; b=r1CaYJBF3dEyq8S4hfdARKd96Omms3416UIDry4XIsrp5C6Zj58KdPy8myD1b1aVCo NhuoUzDosrZRwbuIBpzSlvSsdFOeQr1614g9VdyF8Uk7ETlara0v147DfeOIWekfBF1r 1ZgD82bvMvXLsHNa0/F9rDVzdwSzeznt1xsBWY1HbmhbmY08hkAzU70SWT9b8NpO/AP0 Y9h4G/xUfBv41+XFseA+7BNbCkl+tOLeNO4/AJXD79x7F07IyLEt1iKreO/AoSOnzhyi zHHynJXS5nYVQ7k+2k9JY3LzTSq+kNpc0HDRj9bMa9gy4OTXsIN4VXefZAcq2CEn6A2+ 3hCA== X-Gm-Message-State: AOAM533Evr3zW3jHhpu94Rbj0xQ/P9JnQoozwYG7CiWwqNQQbIuCGl1F 7lhAnaXfe0OwI7Ru/1HvBLW4Mh7SnylWTd7RPd/D9pP33LEcu8H58TQapnelphufr+OYSR+A+Hc KAFeTZS2zI+ia+Q== X-Received: by 2002:a5d:410c:: with SMTP id l12mr4237611wrp.173.1605010578394; Tue, 10 Nov 2020 04:16:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxCun8IOxFXe2S82lC2dLqCNY1vTfKsDPpmVyK1ixe6cNNJuS7JOgbH0wNycXKqy3SwyQI8A== X-Received: by 2002:a5d:410c:: with SMTP id l12mr4237582wrp.173.1605010578183; Tue, 10 Nov 2020 04:16:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , Thomas Huth , Laszlo Ersek , Bin Meng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 2/2] gitlab-ci: Avoid running the EDK2 job when not necessary Date: Tue, 10 Nov 2020 13:16:06 +0100 Message-Id: <20201110121606.2792442-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201110121606.2792442-1-philmd@redhat.com> References: <20201110121606.2792442-1-philmd@redhat.com> 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) The EDK2 jobs use the 'changes' keyword, which "makes it possible to define if a job should be created based on files modified by a Git push event." (see [1]). This keyword comes with a warning: Caution: In pipelines with sources other than the three above changes can=E2=80=99t determine if a given file is new or old and always returns true." In commit 922febe2af we moved the YAML config file from the repository root directory to the .gitlab-ci.d/ directory. We didn't respect the previous warning and disabled the 'changes' filter rule, as the files are now in a (directory) three above the YAML config file. This jobs takes ~40min, and needlessly burns the 2000 minutes available to GitLab free users. Follow the recommendations in [3] and disable this job by default (except if we push a tag or the branch contains 'edk2'). Note we do not remove the job from the pipeline, it can still be triggered manually from the WebUI. [1] https://docs.gitlab.com/ee/ci/yaml/#onlychangesexceptchanges [2] https://about.gitlab.com/releases/2020/03/18/ci-minutes-for-free-users/ [3] https://about.gitlab.com/pricing/faq-consumption-cicd/ Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder= ") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/edk2.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index e1e04524166..335c99035c9 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,10 +1,5 @@ docker-edk2: stage: containers - rules: # Only run this job when the Dockerfile is modified - - changes: - - .gitlab-ci.d/edk2.yml - - .gitlab-ci.d/edk2/Dockerfile - when: always image: docker:19.03.1 services: - docker:19.03.1-dind @@ -26,13 +21,15 @@ docker-edk2: build-edk2: stage: build rules: # Only run this job when ... - - changes: # ... roms/edk2/ is modified (submodule updated) - - roms/edk2/* + - if: $CI_COMMIT_TAG # we pushed a tag 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 + # ... else allow manual run on the WebUI + - when: manual + allow_failure: true artifacts: paths: # 'artifacts.zip' will contains the following files: - pc-bios/edk2*bz2 --=20 2.26.2