From patchwork Sat Nov 9 10:14:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842081 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2083706wru; Sat, 9 Nov 2024 02:25:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUN1ocg0FBv7gbGcJ+Fn3vZQdC1V7YMchdUdpkU2KBZUHMsD/tsZtlsZtXJoomCUd+FA48SwA==@linaro.org X-Google-Smtp-Source: AGHT+IGIkQrAic+pud39kTZYpE0MfJIH77ErdoQ69zzcxRLgtVAkRe9ZGRY40x3YhOulHweoa1MG X-Received: by 2002:a05:6214:2d44:b0:6d3:4553:49ac with SMTP id 6a1803df08f44-6d39e1cf0b6mr80309556d6.30.1731147921929; Sat, 09 Nov 2024 02:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731147921; cv=none; d=google.com; s=arc-20240605; b=G2WTrxTwmd0MdsIrBcKW6jNBOlOT3U8pbtUEyreiWpHbL1JAB7fV7ioGfoUi5NabYA 5u9lrlzkeGNFKjgcdmvwnwsqNsAwQfB0/szGqX+gAzu3IXFQ9p9GQM/vJdl5LfyJJbku 4s5FDSYY8WWumecRlRwnSEymezy3mly7/kSXPem2B5r03F/O9sphDh3cl+Nnx+29tA33 +EBUta9fZ4RW9Xt9Ym5ATkj9RTEc2QlybS5/Cpv0U9W0D1K4kfjKtNDLeoiezQiu+KJy 2IUq5ByJD49Z8Kmh7rsR6wtdCTkMvtHYg+tKPr0Rk30N29qsXLYidftFnfLPG7/bT0bm T68w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=mITr+4ff3/eJn4ZukbuQ+0LdyhP5DuTqc2drUwlfOmE=; fh=QunmYwzbXWilzKUSCm5rGLvrKB9FGWCyqo7FW/+IwZI=; b=cSTu8oAXzL8mBeYiKM28s19Fdk1kY245i4ej4P1tjYFYRLirIHhm+fZqcDMbP/AVy2 JZvbUvGb6qkJ8ywiXa6vdYflSOYJBwCut0K/tJu7TuRtYD04nmmiD47xv6oVExcYMy4y KQIuRdzGF4QHen+tpwX79rfdLEX2sGoB1emsUXDBHwyBUPL/qEXYXVvm3TQ1Hi6BuiJn 9VCGkmpARreSYwqsAUFCOh1UwPfng65BBQCQnbF7H7jpcIbK1idWj9B82PmXBen8+ap4 GJaiPKTYT56SZWv3I4mlH84qBuAR0NIwo7Q9mUlzvCj1Q0mRMBAFfoQCFt6prxSRYOaG bFAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d3962106d7si60526176d6.84.2024.11.09.02.25.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 02:25:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9iax-0004y7-Ud; Sat, 09 Nov 2024 05:21:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9iWX-0006ME-VC; Sat, 09 Nov 2024 05:17:01 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9iWW-00086w-22; Sat, 09 Nov 2024 05:16:57 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BE6EBA1401; Sat, 9 Nov 2024 13:13:50 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 65131167EEC; Sat, 9 Nov 2024 13:14:45 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.8 28/49] gitlab: make check-[dco|patch] a little more verbose Date: Sat, 9 Nov 2024 13:14:19 +0300 Message-Id: <20241109101443.312701-28-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée When git fails the rather terse backtrace only indicates it failed without some useful context. Add some to make the log a little more useful. Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20241023113406.1284676-11-alex.bennee@linaro.org> (cherry picked from commit 97f116f9c6fd127b6ed2953993fa9fb05e82f450) Signed-off-by: Michael Tokarev diff --git a/.gitlab-ci.d/check-dco.py b/.gitlab-ci.d/check-dco.py index 632c8bcce8..d221b16bd5 100755 --- a/.gitlab-ci.d/check-dco.py +++ b/.gitlab-ci.d/check-dco.py @@ -19,10 +19,9 @@ reponame = os.path.basename(cwd) repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame) +print(f"adding upstream git repo @ {repourl}") subprocess.check_call(["git", "remote", "add", "check-dco", repourl]) -subprocess.check_call(["git", "fetch", "check-dco", "master"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) +subprocess.check_call(["git", "fetch", "check-dco", "master"]) ancestor = subprocess.check_output(["git", "merge-base", "check-dco/master", "HEAD"], diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py index 39e2b403c9..68c549a146 100755 --- a/.gitlab-ci.d/check-patch.py +++ b/.gitlab-ci.d/check-patch.py @@ -19,13 +19,12 @@ reponame = os.path.basename(cwd) repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame) +print(f"adding upstream git repo @ {repourl}") # GitLab CI environment does not give us any direct info about the # base for the user's branch. We thus need to figure out a common # ancestor between the user's branch and current git master. subprocess.check_call(["git", "remote", "add", "check-patch", repourl]) -subprocess.check_call(["git", "fetch", "check-patch", "master"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) +subprocess.check_call(["git", "fetch", "check-patch", "master"]) ancestor = subprocess.check_output(["git", "merge-base", "check-patch/master", "HEAD"],