From patchwork Sun Feb 22 15:42:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 128 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=1771775007; bh=T2iT2bt+xrP+u2HK3a4/819bykCn066jfrNDtR6xJb8=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=NLZcCKv3m0kcILNG3P9CBaXiBzhRlvwgOlJiFA8hr1XiSw07AaRhd4kryech+LwmJ DeWbv6qb2qMSGRFel4RrmA02XjuoCJLNOH6Y3sVQBu9uTY39JUlec64sb06ajLaySF /mmajdjPA7ds7Dx01zMxvEzzMhKYXKhw6rVFB8dPopWNlO6xDakvOmIvtGL9J0sCm/ +pYTjNynca2GXVXvTQlwYYCHSqUcxChfwwJVKR1MnwJKA4AIZYZf3gcj5NZdNwT/XQ 8Rb2szDu8LiRVaW+nadmZP8+Ff5l+tyNT77ObDAM1LfZPEhOZp+j0Gn9tRqI7MTbnd w6PVjA6P1CrHg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 5B40A69D36 for ; Sun, 22 Feb 2026 08:43:27 -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 otTb-PvDazkb for ; Sun, 22 Feb 2026 08:43:27 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771775007; bh=T2iT2bt+xrP+u2HK3a4/819bykCn066jfrNDtR6xJb8=; h=From:To:Date:CC:Subject:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=NLZcCKv3m0kcILNG3P9CBaXiBzhRlvwgOlJiFA8hr1XiSw07AaRhd4kryech+LwmJ DeWbv6qb2qMSGRFel4RrmA02XjuoCJLNOH6Y3sVQBu9uTY39JUlec64sb06ajLaySF /mmajdjPA7ds7Dx01zMxvEzzMhKYXKhw6rVFB8dPopWNlO6xDakvOmIvtGL9J0sCm/ +pYTjNynca2GXVXvTQlwYYCHSqUcxChfwwJVKR1MnwJKA4AIZYZf3gcj5NZdNwT/XQ 8Rb2szDu8LiRVaW+nadmZP8+Ff5l+tyNT77ObDAM1LfZPEhOZp+j0Gn9tRqI7MTbnd w6PVjA6P1CrHg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 37ADF69D3F for ; Sun, 22 Feb 2026 08:43:27 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771775001; bh=hk5uUC50YqVA5DyV5LLU9Oqw+/1aH2+4PxcOqKZ2wxQ=; h=From:To:Cc:Subject:Date:From; b=dHKu6ZuiUaZODdmjzrhUr0aCBeOFp1YW9Ruj8I7wT63aapa5Snn+VXSyP6ywb1FtI GgLeMoImw0kqDhG9VEE+oUFjeRuU38QsLy4jyTO8gwQSUcZPUcuQE/HsMJutikd4uP hbQehf5eP7783ow8S+Tqileu0OKpWU/d+JTGSIR49J7rak11U/Sc9eMZ7+JOYtiKMW m1fN3vFbXHX0dvVA/Z8jCJf4XiE6O5p8a5XLr2Z/wb8Ey8fp8++PYjFn4hTp80tUrV wKTvWZPt/U0aW4R/H144IE97h7pmE1wOOs978gZ7Qw4X2l/CRb5Q6tB7PddkpDRKE7 I3h3TR5LUz7rg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 0C35C69C65; Sun, 22 Feb 2026 08:43:21 -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 K8_y-Z4oL0uc; Sun, 22 Feb 2026 08:43:20 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1771774992; bh=bDf5BrRxHX+gVv4Z6gRAglomlch1UqsXjcE+T2aQw9Q=; h=From:To:Cc:Subject:Date:From; b=l4C7V5OEOd7cvkrKfHIpQ4GVVD4WwPxJqrE38r7UcyhBqYGHbBv1kMwLOzAbkTYW9 qJrZWMjOzEmeI2j3u2YrSVT/rcg9xyCFnnk+twwDKljQXXN2EKL+sPbb8vEzQNl/dP IzLsdwEEk3hMqAdsSs/OLSjnqnqRQbljqrS/FuQKAw9aJRgNA9ko44ntQR3bWMuA1W tkMMbnsbz8Jntx7FDUQ+k9yoob5iiKoz6eVX2Hz7lzY5azh4i0s0VZwfZjY2n36J1Y eVlHCtldRQaD+AdplMGYSj2FX0XJdbdVEM5uZaUpaCMFWYbBdOZ9HNbSrAJK8sdpgd wWKMnoriNB0XA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id DC54E69C5C; Sun, 22 Feb 2026 08:43:11 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Sun, 22 Feb 2026 08:42:40 -0700 Message-ID: <20260222154303.2851319-1-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Message-ID-Hash: UCBII4BAQWJDEQEWBEFWAZKAVHDVJRFH X-Message-ID-Hash: UCBII4BAQWJDEQEWBEFWAZKAVHDVJRFH 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 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 00/16] pickman: Support monitoring and fixing pipeline failures 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 This series contains three groups of improvements to pickman: Refactoring (patches 1-8): Clean up the codebase by splitting large functions into smaller helpers, adding test coverage for prepare_apply(), extracting a run_agent_collect() helper to remove duplicated agent-streaming code, and switching to tools.read/write_file() for file I/O. Subtree handling (patches 9-10): Teach pickman to detect and handle dts/upstream subtree merges, and process subtree updates even when the maximum number of MRs is reached. Pipeline fixes (patches 11-16): Add infrastructure and logic for automatically diagnosing and fixing CI pipeline failures using a Claude agent, including GitLab API helpers, database tracking, null-byte stripping in job logs, and a retry/comment system. Simon Glass (16): pickman: Drop unnecessary f-string prefixes in do_rewind() pickman: Refactor do_rewind() into smaller helpers pickman: Refactor do_next_merges() into smaller helpers pickman: Refactor decompose_mega_merge() into smaller helpers pickman: Refactor handle_already_applied() into smaller helpers pickman: Add tests for prepare_apply() pickman: Refactor the initial part of prepare_apply() pickman: Handle dts/upstream subtree merges automatically pickman: Create a function to run an agent pickman: Use tools for file I/O pickman: Use tools for file I/O in tests pickman: Add a database table to track pipeline fixes pickman: Add pipeline helpers to gitlab_api pickman: Support automatically fixing pipeline failures pickman: Process subtree updates even at max MRs pickman: Strip null bytes from CI job logs tools/pickman/README.rst | 81 ++ tools/pickman/__main__.py | 6 + tools/pickman/agent.py | 237 ++++- tools/pickman/control.py | 972 +++++++++++++++----- tools/pickman/database.py | 65 +- tools/pickman/ftest.py | 1661 ++++++++++++++++++++++++++++++++--- tools/pickman/gitlab_api.py | 78 +- 7 files changed, 2744 insertions(+), 356 deletions(-)