From patchwork Wed Dec 17 02:28:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 965 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938620; bh=VXtaspFqp8TrdFiVndjf8U0277pZqvuyHbUtqhEfV7Q=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=NCD7yfQ2tRghLvkUxHp0dEDYawTsCt94G6D36E0+xrhUSQ+frkZjsqbJ4GiftIETT A51KKgl6pQZQfmEpthOHUz22fp6hNx64RJPx168BNluqPdntQGx4eyznBfD3NVDUlN p6jkq2+E2+FeT/eMmM+WCltWOcMF+9Qj0xBAj49d/Fj6NCR/bu/bvTnIJGjUie6bDq x6z6BZIhObI2HOTTvm4V1YfH9x5f9eO/TM3nXg639Y9aqIDxx9bwP17VgIYD6YeAtl /pHfnyBfYdF17gU5TimugiGxImLr9+QtbrZPdkaqCfrYw54rlP6qsf30YAGvog7ROS 7OkZvC9HpUYAQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id AF8A768BD9 for ; Tue, 16 Dec 2025 19:30:20 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 7bSwjMaoKIol for ; Tue, 16 Dec 2025 19:30:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938619; bh=VXtaspFqp8TrdFiVndjf8U0277pZqvuyHbUtqhEfV7Q=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PChgbLSg0OfpcvhPqidsrlFnpWCf2YQWE2+RbH4vEsREOBrp115CaVDbzrzHZrzQ4 Fdt673co7Pq5wUbF1iA+/T8/k88e/x2zrRUBqIHPkq6SJkELpt74SbckDr+9SPNs+x Ut0uHo3V6+uCua+XSi5IsL7kNtKW4CwHEF0uznYMTa94vygU0Mg26TidhGVSegDb9r h0nYk6Jc1xKE5kDwpQo9HkIq8ovDz/ZX2nuHU8Yt2/irDNouL6nvHLt368u2I58l1+ CxV8HcwhKHmsCQSPtvnyh9FgetCG2uTWm+WfksJWmJGX5pjYL7RZiwWmGW0s7m7iGl YF+ugHTHKGdiQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id A7D3168AFD for ; Tue, 16 Dec 2025 19:30:19 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938617; bh=cy8CByNnTorqPEVq99Vo5/WFXHGZ+62PcYUZu9awXGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bkfi49bO0VTjJZlmXyt/F5GwuHmjIBV0W1jZqtoJzwDzAHnJ1mP4wrnDSA/xOaBun YRUb6UykVsiD2RKU0V2U6Y3tyl3R3ReIk9QvX4DlMefMSGpLqsuT1rtI4tKVdTW30m SwwbLnuPCythXiQ78nEVO59KgEtO7W3FhPjzkx56F//JMGmQOaSJYlToLSQqyfJyPs wBFTCaq4l/6tZ07/+mU2OMUFQPAWy8cITv5RZIfjwX9FpglQmwFydquhtMc0aPYc0f F8QDxdI0G+7FGOy1Z4AoETG9NYnAqaJewODFfI2HauRFXAj/+S3fOHcaCQK9EtuJ7v qnoUhs+BwHtzw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id EF36068AFD; Tue, 16 Dec 2025 19:30:17 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 7HV0F2uPjTuP; Tue, 16 Dec 2025 19:30:17 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765938617; bh=jcGlRhSMPaMvbc2b2FrGhyoXthtg/xptW/XaXbTcUb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWLZQQp8DjG31sq5qVEoo08rorAPAj7RyAmjN0wK1xW0/+a6O1eUriWjveZs1aX+4 +rrk5vduw8zkgJqtXP02xg23J7aTFdlNseY1YGD9iUvS5y9IkXfSaWOtwjPUZIIaFp Y7eSP0H0/LO0v7VSreN1psGc2Qo1i1laOmYOvSH5LAJnf8BW+yOSGy9J/X6/sL3cuT e46+6adFTzalZ9VLQ5raimKzB5pSuxLVqhf6l0WBTnvpLNKWJoTuTzspw0oefCcFb/ /w3ZzvyN9Wn2Erg6opTkmpFF3+WM6Od8Kq+3N0Y8n3qnNKD867hTQzOHYsws/g8iNu ZRzmEBR3+TNzw== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 5966C6884F; Tue, 16 Dec 2025 19:30:17 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Tue, 16 Dec 2025 19:28:11 -0700 Message-ID: <20251217022823.392557-23-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251217022823.392557-1-sjg@u-boot.org> References: <20251217022823.392557-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SNQY7XNCP42XMVO5OWGGQ7FSBQOFKKHX X-Message-ID-Hash: SNQY7XNCP42XMVO5OWGGQ7FSBQOFKKHX X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 22/24] pickman: Skip push pipeline for MR branches List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Remove SJG_LAB CI variable from push since lab tests are now triggered automatically for MR pipelines via .gitlab-ci.yml rules. Keep ci.skip to avoid running a pipeline on push; the MR pipeline will run when the merge request is created. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- tools/pickman/gitlab_api.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/pickman/gitlab_api.py b/tools/pickman/gitlab_api.py index 0db251bd9b8..50c3ec67909 100644 --- a/tools/pickman/gitlab_api.py +++ b/tools/pickman/gitlab_api.py @@ -146,10 +146,8 @@ def push_branch(remote, branch, force=False): bool: True on success """ try: - # Use ci.skip to avoid duplicate pipeline (MR pipeline will still run) - # Set SJG_LAB=1 CI variable for the MR pipeline - args = ['git', 'push', '-u', '-o', 'ci.skip', - '-o', 'ci.variable=SJG_LAB=1'] + # Skip push pipeline; MR pipeline will run when MR is created + args = ['git', 'push', '-u', '-o', 'ci.skip'] if force: args.append('--force-with-lease') args.extend([remote, branch])