From patchwork Wed Jan 10 14:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Hassick X-Patchwork-Id: 135830 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B4B1E43883; Wed, 10 Jan 2024 15:58:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFB1B40269; Wed, 10 Jan 2024 15:58:31 +0100 (CET) Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by mails.dpdk.org (Postfix) with ESMTP id 91E3B4021E for ; Wed, 10 Jan 2024 15:58:30 +0100 (CET) Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-67fb9df3699so30322356d6.2 for ; Wed, 10 Jan 2024 06:58:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1704898710; x=1705503510; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YQOvGQL+AW4DsRXJCSD8qBdX9tLjw7aoOI/7UQeFREQ=; b=jEXvShmqaEWwEaDdcPrzR9OaL5LrmWdcTbsnYfH8FK7vzAW7+d7M80CBXQd9kh4ytL DtGaKcHx9rG2b+QSz5DDbsmGyaX+gHwiNyF+wycMjq6d11jZSmGbgEW77ce2z0nXTMeu 79y1x0Mcg5MUPEBZtmfQJurk6MBBdkeklf8KE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898710; x=1705503510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YQOvGQL+AW4DsRXJCSD8qBdX9tLjw7aoOI/7UQeFREQ=; b=oDOG6r3wck0W/W9oydTWvHUW1AwdLSb/pXn+Ol+CjvIrT/YF12z0NVlF/bXnNzEQLp pmloVeGJSNMB+klNHhS59gpj8qnhwrK8jTSjJFBImX7q+++Pp+MD7tvPyrGCIwoRCM1t fOA+km9xtnAVK4GtrP4dFszO9USyCGGnKgBy505JO5ujb2rQpgasQ7LcYWVijQnLEYiy Splva25daa3XeeBcMBadW/hpxdiNp4VPBypOP8HH5ePgflyiAdXr1XG1NfBVdpB/1CJ5 gqQ+JGrph+knxEFxhpxRmyPPGYFc7JFO6zem79O36UTw+rlXkLEAmG77fO2bzlw9eY6e vTHg== X-Gm-Message-State: AOJu0YzTNUbRAUQyIAwRbWXJK5sNn9LA25DWoicFet08KbLh9K6cdNti U/VjcVSGpfr3lMRtqpLlz3TTveq2sONtrNzw4KdLwQAdAhJin1hSADD5RQ8OZKB8Xs4e458eYtr KyUSY6aw6TNRtvQYBCetCl101tcC10pMiNHuRLmsV7gJftLIJK4h49HUx1X0Kytt2RfvVI3qH X-Google-Smtp-Source: AGHT+IHVqOM/U/eKRTM97bIi9D7Ghqqbi9hpKMWHY8jMHQ8HT8vr3O79o5qQijiqDwazgWHvr2bO3A== X-Received: by 2002:ad4:5c8c:0:b0:680:a1c:9501 with SMTP id o12-20020ad45c8c000000b006800a1c9501mr1770432qvh.65.1704898709733; Wed, 10 Jan 2024 06:58:29 -0800 (PST) Received: from pogmachine2.loudonlune.net ([216.212.51.182]) by smtp.gmail.com with ESMTPSA id da7-20020a05621408c700b00680b1a92322sm1755378qvb.77.2024.01.10.06.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 06:58:29 -0800 (PST) From: Adam Hassick To: ci@dpdk.org Cc: aconole@redhat.com, alialnu@nvidia.com, Adam Hassick Subject: [PATCH 1/2] tools: Add script to create artifacts Date: Wed, 10 Jan 2024 09:57:14 -0500 Message-ID: <20240110145715.28157-2-ahassick@iol.unh.edu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240110145715.28157-1-ahassick@iol.unh.edu> References: <20240110145715.28157-1-ahassick@iol.unh.edu> MIME-Version: 1.0 X-BeenThere: ci@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK CI discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ci-bounces@dpdk.org This script takes in a URL to a series on Patchwork and emits a tarball which may be used for running tests. Signed-off-by: Adam Hassick --- tools/create_series_artifact.py | 453 ++++++++++++++++++++++++++++++++ 1 file changed, 453 insertions(+) create mode 100755 tools/create_series_artifact.py diff --git a/tools/create_series_artifact.py b/tools/create_series_artifact.py new file mode 100755 index 0000000..3049aaa --- /dev/null +++ b/tools/create_series_artifact.py @@ -0,0 +1,453 @@ +#!/usr/bin/env python3 + +import argparse +import os +import subprocess +import requests +import pathlib +import yaml +import pygit2 +import requests +import shutil + +from dataclasses import dataclass +from typing import Optional, Dict, Tuple, Any, List + + +@dataclass +class CreateSeriesParameters(object): + pw_server: str + pw_project: str + pw_token: str + git_user: str + git_email: str + series_url: str + patch_ids: List[int] + labels: List[str] + apply_error: Optional[Tuple[str, str]] + config: Dict + series: Dict + pw_mcli_script: pathlib.Path + patch_parser_script: pathlib.Path + patch_parser_cfg: pathlib.Path + lzma: bool + output_tarball: pathlib.Path + output_properties: pathlib.Path + no_depends: bool + docs_only: bool + + def __get_tags(self) -> List[str]: + series_filename = f"{self.series['id']}.patch" + + # Pull down the patch series as a single file. + pulldown_result = subprocess.run( + [ + "git", + "pw", + "--server", # Pass in the pw server we wish to download from. + self.pw_server, + "series", + "download", + "--combined", # Specifies that we want the series in one patch file. + str(self.series["id"]), + series_filename, + ], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + + # Assert that this succeeds. + pulldown_result.check_returncode() + + # Call the patch parser script to obtain the tags + parse_result = subprocess.run( + [self.patch_parser_script, self.patch_parser_cfg, series_filename], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + + # Assert that patch parser succeeded. + parse_result.check_returncode() + + # Return the output + return parse_result.stdout.decode().splitlines() + + def __init__(self): + parser = argparse.ArgumentParser( + formatter_class=argparse.RawDescriptionHelpFormatter, + description="""This script will create an artifact given a URL to a Patchwork series. +Much of the information provided is acquired by this script through the use of a configuration file. +This configuration file can be found with the other script configs in the config directory of the CI repo. + +The configuration file is used to aggregate: + - Git credentials + - Patchwork configuration and the user token (user token is optional) + - The URL of the DPDK Git mirror + - Locations of dependency scripts and their configuration files + +More detail and examples can be found in the default configuration file. +This default file is located at "config/artifacts.yml" in the dpdk-ci repository. +""", + ) + parser.add_argument( + "config", + type=argparse.FileType(), + help="The config file to load. Must be a path to a YAML file.", + ) + parser.add_argument( + "series_url", type=str, help="The URL to a Patchwork series." + ) + parser.add_argument( + "-t", + "--pw-token", + dest="pw_token", + type=str, + help="The Patchwork token", + ) + parser.add_argument( + "-l", + "--lzma", + action="store_true", + help="Use LZMA compression rather than GNU zip compression.", + ) + parser.add_argument( + "-nd", + "--no-depends", + action="store_true", + help="Do not use the Depends-on label.", + ) + + args = parser.parse_args() + + # Collect basic arguments. + self.series_url = args.series_url + self.no_depends = args.no_depends + self.lzma = args.lzma + + # Read the configuration file. + with args.config as config_file: + self.config = yaml.safe_load(config_file) + + self.pw_server = self.config["patchwork"]["server"] + self.pw_project = self.config["patchwork"]["project"] + + if args.pw_token: + self.pw_token = args.pw_token + else: + self.pw_token = self.config["patchwork"].get("token") + + if not self.pw_token: + print("Failed to obtain the Patchworks token.") + exit(1) + + self.pw_mcli_script = pathlib.Path( + self.config["pw_maintainers_cli"]["path"] + ).absolute() + self.git_user = self.config["git"]["user"] + self.git_email = self.config["git"]["email"] + + self.patch_parser_script = pathlib.Path( + self.config["patch_parser"]["path"] + ).absolute() + self.patch_parser_cfg = pathlib.Path( + self.config["patch_parser"]["config"] + ).absolute() + + if self.lzma: + tarball_name = "dpdk.tar.xz" + else: + tarball_name = "dpdk.tar.gz" + + self.output_tarball = pathlib.Path(tarball_name) + self.output_properties = pathlib.Path(f"{tarball_name}.properties") + + # Pull the series JSON down. + resp = requests.get(self.series_url) + resp.raise_for_status() + self.series = resp.json() + + # Get the labels using the patch parser. + self.labels = self.__get_tags() + + # See if this is a documentation-only patch. + self.docs_only = len(self.labels) == 1 and self.labels[0] == "documentation" + + # Get the patch ids in this patch series. + self.patch_ids = list(map(lambda x: int(x["id"]), self.series["patches"])) + self.patch_ids.sort() + + +class ProjectTree(object): + artifact_path: pathlib.Path + tree: str + commit_id: str + path: pathlib.Path + log_file_path: pathlib.Path + props_file_path: pathlib.Path + data: CreateSeriesParameters + repo: pygit2.Repository + log_buf: List[str] + properties: Dict[str, Any] + + def log(self, msg: str): + print(msg) + self.log_buf.append(msg) + + def write_log(self): + with open(self.log_file_path, "w") as log_file: + log_file.write("\n".join([msg for msg in self.log_buf])) + + def write_properties(self): + with open(self.props_file_path, "w") as prop_file: + for key, value in self.properties.items(): + prop_file.write(f"{key}={value}\n") + + def move_logs(self): + shutil.move(self.log_file_path, pathlib.Path(os.getcwd(), "log.txt")) + shutil.move( + self.props_file_path, pathlib.Path(os.getcwd(), self.data.output_properties) + ) + + def __init__(self, data: CreateSeriesParameters): + self.data = data + self.path = pathlib.Path(os.curdir, "dpdk").absolute() + self.log_buf = [] + self.log_file_path = pathlib.Path(self.path, "log.txt") + self.props_file_path = pathlib.Path(self.path, data.output_properties) + self.tree = "main" + self.properties = {} + self.artifact_path = data.output_tarball + + # Set the range of patch IDs this series (aka patchset) covers. + self.properties["patchset_range"] = f"{data.patch_ids[0]}-{data.patch_ids[-1]}" + + # Set the tags using tags obtained by the params class + self.properties["tags"] = " ".join(data.labels) + + # Record whether this patch is only documentation + self.properties["is_docs_only"] = str(data.docs_only) + + if not self.path.exists(): + # Find the URL to clone from based on the tree name. + repo = self.data.config["repo_url"] + + self.log(f"Cloning the DPDK mirror at: {repo}") + + # Pull down the git repo we found. + repo = pygit2.clone_repository(repo, self.path) + else: + # Fetch any changes. + repo = pygit2.Repository(self.path) + + self.log(f"Fetching the remote for tree: {self.tree}") + + origin: pygit2.Remote = repo.remotes["origin"] + + progress = origin.fetch() + + self.log( + f"Received objects: {progress.received_objects} of {progress.total_objects}" + ) + + self.log("Cleaning repository state...") + + repo.state_cleanup() + + # Initially, check out to main. + self.repo = repo + self.checkout("main") + + self.log(f"Done: {self.tree} commit {self.commit_id}") + + def checkout(self, branch: str) -> Optional[str]: + """ + Check out to some branch. + Returns true if successful, false otherwise. + """ + if branch not in self.repo.branches: + return None + + git_branch = self.repo.branches[branch] + self.log(f"Trying to checkout branch: {git_branch.branch_name}") + reference = self.repo.resolve_refish(git_branch.branch_name) + self.commit_id = str(reference[0].id) + self.repo.checkout(reference[1]) + self.tree = branch + + return branch + + def guess_git_tree(self) -> Optional[str]: + """ + Run pw_maintainers_cli to guess the git tree of the patch series we are applying. + Returns None if the pw_maintainers_cli failed. + """ + + if "id" not in self.data.series: + raise Exception("ID was not found in the series JSON") + + result = subprocess.run( + [ + self.data.pw_mcli_script, + "--type", + "series", + "--pw-server", + self.data.pw_server, + "--pw-project", + self.data.pw_project, + "list-trees", + str(self.data.series["id"]), + ], + stdout=subprocess.PIPE, + cwd=self.path, + env={ + "MAINTAINERS_FILE_PATH": "MAINTAINERS", + "PW_TOKEN": self.data.pw_token, + }, + ) + + if result.returncode == 0: + branch = result.stdout.decode().strip() + + if branch in ["main", "dpdk"]: + branch = "main" + else: + return None + + if branch[0:5] == "dpdk-": + branch = branch[5 : len(branch)] + + return self.checkout(branch) + + def set_properties(self): + self.properties["tree"] = self.tree + self.properties["applied_commit_id"] = self.commit_id + + def apply_patch_series(self) -> bool: + # Run git-pw to apply the series. + + # Configure the tree to point at the given patchwork server and project + self.repo.config["pw.server"] = self.data.pw_server + self.repo.config["pw.project"] = self.data.pw_project + self.repo.config["user.email"] = self.data.git_email + self.repo.config["user.name"] = self.data.git_user + + result = subprocess.run( + ["git", "pw", "series", "apply", str(self.data.series["id"])], + cwd=self.path, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + + # Write the log from the apply process to disk. + self.log(f"Applying patch...") + self.log(result.stdout.decode()) + self.log(result.stderr.decode()) + + # Store whether there was an error, and return the flag. + error = result.returncode != 0 + self.properties["apply_error"] = error + return not error + + def test_build(self) -> bool: + ninja_result: Optional[subprocess.CompletedProcess] = None + meson_result: subprocess.CompletedProcess = subprocess.run( + ["meson", "setup", "build"], + cwd=self.path, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + + build_error = meson_result.returncode != 0 + + self.log("Running test build...") + self.log(meson_result.stdout.decode()) + + if not build_error: + ninja_result = subprocess.run( + ["ninja", "-C", "build"], + cwd=self.path, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + + build_error = build_error or ninja_result.returncode != 0 + shutil.rmtree(pathlib.Path(self.path, "build")) + + self.log(ninja_result.stdout.decode()) + self.log(ninja_result.stderr.decode()) + + self.log(meson_result.stderr.decode()) + + if build_error: + self.log("Test build failed.") + + self.properties["build_error"] = build_error + return not build_error + + def create_tarball(self): + # Copy the logs into the artifact tarball. + self.write_log() + self.write_properties() + + tar_args = ["tar"] + + if self.data.lzma: + tar_args.append("--lzma") + else: + tar_args.append("-z") + + tar_args.extend(["-cf", self.artifact_path, "-C", self.path, "."]) + + result = subprocess.run( + tar_args, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + + if result.returncode != 0: + return False + + print("Successfully created artifact:", self.artifact_path) + + # Move the log file out of the working directory. + self.move_logs() + + return True + + +def try_to_apply(tree: ProjectTree) -> bool: + tree.set_properties() + return tree.apply_patch_series() and tree.test_build() and tree.create_tarball() + + +def main() -> int: + data = CreateSeriesParameters() + + # Get the main branch. + # We solve the chicken and egg problem of pw_maintainers_cli needing + # information in the repository by always pulling down the main tree. + tree = ProjectTree(data) + + # Try to guess the Git tree for this patchset. + guessed_tree = tree.guess_git_tree() + + # Try to apply this patch. + if not ( + try_to_apply(tree) # First, try to apply on the guessed tree. + or guessed_tree != "main" # If that fails, and the guessed tree was not main + and tree.checkout("main") # Checkout to main, then + and try_to_apply(tree) # Try to apply on main + ): + tree.write_log() + tree.write_properties() + tree.move_logs() + + print("FAILURE") + + return 1 + + return 0 + + +if __name__ == "__main__": + exit(main()) From patchwork Wed Jan 10 14:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Hassick X-Patchwork-Id: 135831 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CEBA443883; Wed, 10 Jan 2024 15:58:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8D6940269; Wed, 10 Jan 2024 15:58:33 +0100 (CET) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by mails.dpdk.org (Postfix) with ESMTP id D86A14021E for ; Wed, 10 Jan 2024 15:58:32 +0100 (CET) Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-680b1335af6so41394946d6.1 for ; Wed, 10 Jan 2024 06:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1704898712; x=1705503512; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lZnP2xgG/Bcaoa0SruIVp07wxARLpNWE/+Znwk3h0Og=; b=P4rnB2kc8FRU186iRCvFJ3lTBMbwUdUac6JT3ndlwMoqa7cvdFphi5uP4UQ7YiUtb+ ESrBn2liH25f3Fukv5goO9sX8vV/LJpj8WbxVWegSZ+UOBFKqS6zZdx1RDqyEZeajeyv 5Y6HtsMs2qOPVEjAPU6U7K3n4yMMPgL5CreAk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704898712; x=1705503512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lZnP2xgG/Bcaoa0SruIVp07wxARLpNWE/+Znwk3h0Og=; b=pRJ+RJ49AZZhlpE/8MeEVdbdR5h0f7Sh7V1di+8FD5k7igbgnHb5AHDq0oPWYtmyS7 nBhQxrD1hxRw6XUPzIGAWXR/KTTDDjW7DhOWLwjGZNbvMkkTSjSlts73F121SrN96Gj5 S34B5Jtu0JET0gIZJhuY8oBWy8ICSzBIOQYq5Bo3KYeHEEeV/aKeIGqDJ6Pj5Tdek/RI mc1ywiCoxOUOLStqc699gxG3kSKQz5TezOTAjPep9wzLuhyMc4sJdXsIMt6qyvB0WVx3 OwLx7FlP8P4ERvmuF5eIMfdOxIbM0kXg/DskjW0CV5def7QP720SQhPd24sZLF7EqcHN 8PIA== X-Gm-Message-State: AOJu0Yy/D0XXkNobepYbRYOuOy83c33Gls9jjiWR48MLNK76Hdpx8SP+ dIOkVKegYkb/SLXUk5hXsw7NJgE4AxfGJIYf9ZVVdnhkUKULZqvQy5FDhjE0acJ0CuXA6z+amJv Ld8PzZ8xY6/UpTQwce+arwbrtZKe20MgBKpLaFsLsELiLDrGDINTxt8b59vRe13MmfWl8UrZL X-Google-Smtp-Source: AGHT+IFuDddHjcQLdfsu+sLXFAsU5LAQO8sR62nikdTaEf8J0ZzL3Ooo250TuCc7WxRsA+/KCh90zQ== X-Received: by 2002:ad4:5ca2:0:b0:680:f70a:44d1 with SMTP id q2-20020ad45ca2000000b00680f70a44d1mr292158qvh.43.1704898712122; Wed, 10 Jan 2024 06:58:32 -0800 (PST) Received: from pogmachine2.loudonlune.net ([216.212.51.182]) by smtp.gmail.com with ESMTPSA id da7-20020a05621408c700b00680b1a92322sm1755378qvb.77.2024.01.10.06.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 06:58:31 -0800 (PST) From: Adam Hassick To: ci@dpdk.org Cc: aconole@redhat.com, alialnu@nvidia.com, Adam Hassick Subject: [PATCH 2/2] config: Add example config file Date: Wed, 10 Jan 2024 09:57:15 -0500 Message-ID: <20240110145715.28157-3-ahassick@iol.unh.edu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240110145715.28157-1-ahassick@iol.unh.edu> References: <20240110145715.28157-1-ahassick@iol.unh.edu> MIME-Version: 1.0 X-BeenThere: ci@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK CI discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ci-bounces@dpdk.org Adds an example configuration file for the new create series artifact script. The set values should work if the script is run from inside the tools directory. Signed-off-by: Adam Hassick --- config/artifacts.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 config/artifacts.yml diff --git a/config/artifacts.yml b/config/artifacts.yml new file mode 100644 index 0000000..dff81ec --- /dev/null +++ b/config/artifacts.yml @@ -0,0 +1,22 @@ +--- + +# Patchwork settings for git-pw +patchwork: + server: http://patchwork.dpdk.org/api/1.3 + project: http://patchwork.dpdk.org/projects/dpdk/list +# token: + +# Git user and email. +git: + email: your@email.here + user: Artifact Robot + +# Paths to scripts and configs. +patch_parser: + path: ./patch_parser.py + config: ../config/patch_parser.cfg +pw_maintainers_cli: + path: ./pw_maintainers_cli.py + +# Where to clone a DPDK mirror from +repo_url: "https://github.com/DPDK/dpdk.git" \ No newline at end of file