From patchwork Tue Nov 10 12:16:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1397618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WJj7LGhA; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CVn0w4FFYz9sPB for ; Tue, 10 Nov 2020 23:17:04 +1100 (AEDT) Received: from localhost ([::1]:48530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcSa6-0000Hx-Gw for incoming@patchwork.ozlabs.org; Tue, 10 Nov 2020 07:17:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcSZQ-0000FB-99 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 07:16:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcSZO-0000jC-8K for qemu-devel@nongnu.org; Tue, 10 Nov 2020 07:16:19 -0500 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= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-iyO4n_fANQ2cL3WmWN96ow-1; Tue, 10 Nov 2020 07:16:15 -0500 X-MC-Unique: iyO4n_fANQ2cL3WmWN96ow-1 Received: by mail-wm1-f71.google.com with SMTP id a130so1079582wmf.0 for ; Tue, 10 Nov 2020 04:16:14 -0800 (PST) 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=uhWtApcqd7IK0TCnsiTZDi1Ek+nARpEKO2vhRjqt4lVYYbB4kTpBQxiuxwoME1BKAe gJQ7EYthxwJh5vipd0JdSGBoDWjAl+f4kJpsPWpyTnroYELYn0Xw4suMRjdRpiRDctcN ARZaQDWxCdjvqkFGd/hX1SzjZ4XsxdUTHAV+gpAXlBATdxgycBLdP+LwoS5EEiyDIauz Ass8egfvD64WZ9lwOfOE6S5Pl1n3euVazTVnp+UP8LV6v1OYWLXtvA8YrM9xlrgyiAUU P0XTMsICkmpbF5fQumz2WAfiGhS65Gfas8gh/DB0jQcGcp7/vvP8jhFHfBawFDDGIeNW nRuA== X-Gm-Message-State: AOAM530qOd7VvU43c/0YN9d1GUrDdTdBepA9G7HaPz932fTPGcdAfJFB q9azR9LTM3UMHb66ub5Z/S56KESpo63C3Ib07ulXYPAHYOdRVKDvfCtdpLSrfuAkWykpb7us3W/ GhaJL41CMx7l6fKt7bQqLQMQPcWX200XmSjvcEW6z6cxc3JxHbo5OUpgTF9JvRUo1 X-Received: by 2002:adf:a29e:: with SMTP id s30mr25357003wra.29.1605010573603; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 02:00:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 , "Daniel P . Berrange" , Laszlo Ersek , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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’t 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é --- .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: 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 =~ /^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 From patchwork Tue Nov 10 12:16:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1397620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RtQ/ziro; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CVn1Y1XpYz9sPB for ; Tue, 10 Nov 2020 23:17:37 +1100 (AEDT) Received: from localhost ([::1]:50262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcSad-00012l-2S for incoming@patchwork.ozlabs.org; Tue, 10 Nov 2020 07:17:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcSZY-0000Jc-EQ for qemu-devel@nongnu.org; Tue, 10 Nov 2020 07:16:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38331) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcSZW-0000ke-9p for qemu-devel@nongnu.org; Tue, 10 Nov 2020 07:16:28 -0500 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= 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-325-3oX8VYwGMMuNtp09sB_xSA-1; Tue, 10 Nov 2020 07:16:19 -0500 X-MC-Unique: 3oX8VYwGMMuNtp09sB_xSA-1 Received: by mail-wr1-f70.google.com with SMTP id q1so5631730wrn.5 for ; Tue, 10 Nov 2020 04:16:19 -0800 (PST) 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=mimZF04U7O9SSMLTzP1FWVa62cj/w2xsOABydTYuNTrUE4NuqelLvqkOwLlWLPq0H4 qH7/DsKXu5JGH6n+s02Aqchc+p85rHP+AhHVkdU9wQm0dubOTF+dNd0nKN9C9361XUwC uoOdOMMkgqUYIGfwygyrZEGMCoUNX1aeBKoqBZmdaqrKfQBeNIm69bsUjv75UQv+Kkwq aMCRFbHWg7tUTMXI7mk/4zHkM3k/qq32hYGxTgMrnpbJdst00rIDqoXpOSQ/eit8KMak /Ao4XL4vxMgbzAqjDAuOc6vMPgs75ViFt2/zQTG0NU0lNCPXHQan/7bzERoGxuVFdpoI hj2Q== X-Gm-Message-State: AOAM530DNNdyWlFZvsHPKXhoVTXuM01cyUtAFZnBdimuhSSGcmNAjRrA e3DKh9hYGfC66QhgMH58YJT0heKgkjCOWHqr57VBoVE5+FiqHsG8kwnWifg1g2uduLTBo4YTaz1 qBNJsKaxVpS0dffqlQQkIDZqnim3iDNNgAXOYHYy8D5Rydb19quY0Sc+xXNmCT4wX X-Received: by 2002:a5d:410c:: with SMTP id l12mr4237618wrp.173.1605010578479; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 02:00:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 , "Daniel P . Berrange" , Laszlo Ersek , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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’t 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é --- .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 =~ /^edk2/' # or the branch/tag starts with 'edk2' when: always - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains '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