From patchwork Sat Nov 9 12:07:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842109 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2123654wru; Sat, 9 Nov 2024 04:37:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVpdaRdqcF4BX73GIICy6we8ole2P7eMY8pW1/MWfAZ8HAg40eGgOttfPN8H94zJZJCgfF/XA==@linaro.org X-Google-Smtp-Source: AGHT+IEUQ6w4GE4Hfbmxr2/Qoz7yPoqt0WG8TZbYPmUz9hL3V+xeSTOeYgq8rblpJ9s5wWHJGKBN X-Received: by 2002:a05:620a:4494:b0:7b1:5311:46a6 with SMTP id af79cd13be357-7b331ebff7fmr834806985a.28.1731155844474; Sat, 09 Nov 2024 04:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731155844; cv=none; d=google.com; s=arc-20240605; b=EtK2PVJgZwO33vG/rMHpBn+nix+rDzCb08STRlPT5j4l9NKdENCcwhS1+tc5x2hNTG 2dATbsYmN/E3HydHrr6Vxjj/ILkEj60MSg8WxUS8SVr+hky8KP8781HWTySM1VpimtIc cAngNRu5uLyu5u24gQ/LfxnYHktq/ZRUqCRVzffWXI6HWTiG9bBS99ctGUNkzXE96Mgx hgu84q7MJC3n2lkjNoDOHuMcSkxw/qpoQ91tWz8MzXOO2Sn1xhDWw0e5eEyXhVf8uORz +lta4LWgI4uEtqs2e2hEZdOd8uSB6h93NvfYC4lEiZy4sXDl/y/THimIz14db3vrlJoS ECTQ== 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=In7tx3TGcb3qC4NVUvzIhB+wIluFWw1euDU3Ilbncgl8piETAd/YXwRbjNEraTTnwp bdaxWhZzC3xH4i4sZSNYmU4Y/8qVigtouzQJUerMljJ9K3aZZwHsfgdjZ1BgU5IvVjNb LG2F6n5yau0zjwyf21f5UT7Tq4060bNZqOZvA/gYfEWh5eVqJpVUIj4IdkcxtB/FFbq3 HcInbfvXYyTXlD94wuOtIQDlQyxUlDWimvw21zXGBjPbjdmtSTIrrVW0mkbBisbHasWn tLf9PcuBng6OeQNJhI9eIxTWSNmIxV65f8aJuC/bZAUyztwueReB/e9SijO0Gf4DBjm2 fx8w==; 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 af79cd13be357-7b32ac3dbb3si634529085a.34.2024.11.09.04.37.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 04:37:24 -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 1t9kKW-0001MR-8q; Sat, 09 Nov 2024 07:12:40 -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 1t9kKH-0008Di-RE; Sat, 09 Nov 2024 07:12:26 -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 1t9kKF-0004Zt-VN; Sat, 09 Nov 2024 07:12:25 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C2F35A160A; Sat, 9 Nov 2024 15:07:08 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 8A282167F98; Sat, 9 Nov 2024 15:08:03 +0300 (MSK) Received: (nullmailer pid 3295357 invoked by uid 1000); Sat, 09 Nov 2024 12:08:01 -0000 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-9.0.4 34/57] gitlab: make check-[dco|patch] a little more verbose Date: Sat, 9 Nov 2024 15:07:36 +0300 Message-Id: <20241109120801.3295120-34-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"],