-
Notifications
You must be signed in to change notification settings - Fork 15
infra: Improve pr pipeline speed #522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e4426ea
Improve perf a bit
frhuelsz fd23395
no parallel in pipelines
frhuelsz 1330beb
capture futures correctly
frhuelsz 0d4fea1
re-add missing pipeline
frhuelsz 6a2fce8
Fixes
frhuelsz 861cece
Merge branch 'main' into user/frhuelsz/pipeline/pr/parallel-make
frhuelsz 32167d5
Lower optimization
frhuelsz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -56,6 +56,7 @@ parser.add_argument( | |||||
| type=str, | ||||||
| help="The pipeline to preview", | ||||||
| choices=pipeline_metadata_map.keys(), | ||||||
| nargs="+", | ||||||
| ) | ||||||
|
|
||||||
| parser.add_argument( | ||||||
|
|
@@ -70,14 +71,75 @@ parser.add_argument( | |||||
| "-q", "--quiet", action="store_true", help="Suppress YAML output", default=False | ||||||
| ) | ||||||
|
|
||||||
| parser.add_argument( | ||||||
| "--parallel", | ||||||
| action="store_true", | ||||||
| help="Preview pipelines in parallel", | ||||||
| ) | ||||||
|
|
||||||
| args = parser.parse_args() | ||||||
|
|
||||||
| if args.parallel and not args.quiet: | ||||||
| parser.error("--parallel requires --quiet (-q)") | ||||||
|
|
||||||
|
|
||||||
| def check_pipeline(pipeline_name: str, selected_branch: str, quiet: bool = False): | ||||||
| pipeline_metadata = pipeline_metadata_map[pipeline_name] | ||||||
|
|
||||||
| if pipeline_metadata.id == -1: | ||||||
| raise Exception(f"Pipeline '{pipeline_name}' is not defined in the script") | ||||||
|
|
||||||
| print( | ||||||
| f"Checking pipeline '{pipeline_name}' with ID '{pipeline_metadata.id}' on branch '{selected_branch}'", | ||||||
| file=sys.stderr, | ||||||
| ) | ||||||
|
|
||||||
| payload = { | ||||||
| "previewRun": True, | ||||||
| "resources": {"repositories": {"self": {"refName": selected_branch}}}, | ||||||
| } | ||||||
|
|
||||||
| if pipeline_metadata.parameters: | ||||||
| payload["templateParameters"] = pipeline_metadata.parameters | ||||||
|
|
||||||
| with tempfile.NamedTemporaryFile() as payload_file: | ||||||
| payload_file.write(json.dumps(payload).encode("utf-8")) | ||||||
| payload_file.flush() | ||||||
|
|
||||||
| cmd = [ | ||||||
| "az", | ||||||
| "devops", | ||||||
| "invoke", | ||||||
| "--org", | ||||||
| "https://dev.azure.com/mariner-org", | ||||||
| "--api-version", | ||||||
| "7.0", | ||||||
| "--area", | ||||||
| "pipelines", | ||||||
| "--resource", | ||||||
| "runs", | ||||||
| "--route-parameters", | ||||||
| f"project={pipeline_metadata.project}", | ||||||
| f"pipelineId={pipeline_metadata.id}", | ||||||
| "--http-method", | ||||||
| "POST", | ||||||
| "--in-file", | ||||||
| payload_file.name, | ||||||
| ] | ||||||
| output = subprocess.run( | ||||||
| cmd, | ||||||
| capture_output=True, | ||||||
| ) | ||||||
|
|
||||||
| if output.returncode != 0: | ||||||
| raise Exception(f"Pipeline preview failed: {output.stderr.decode('utf-8')}") | ||||||
|
|
||||||
| print(f"Pipeline '{pipeline_name}' previewed successfully", file=sys.stderr) | ||||||
|
|
||||||
| pipeline_metadata = pipeline_metadata_map[args.pipeline] | ||||||
| if not quiet: | ||||||
| out_json = json.loads(output.stdout.decode("utf-8")) | ||||||
| print(out_json["finalYaml"]) | ||||||
|
|
||||||
| if pipeline_metadata.id == -1: | ||||||
| print("Pipeline does not exist yet", file=sys.stderr) | ||||||
| exit(2) | ||||||
|
|
||||||
| if args.branch: | ||||||
| selected_branch = args.branch | ||||||
|
|
@@ -93,55 +155,32 @@ else: | |||||
| .strip() | ||||||
| ) | ||||||
|
|
||||||
| print( | ||||||
| f"Checking pipeline '{args.pipeline}' with ID '{pipeline_metadata.id}' on branch '{selected_branch}'", | ||||||
| file=sys.stderr, | ||||||
| ) | ||||||
|
|
||||||
| payload = { | ||||||
| "previewRun": True, | ||||||
| "resources": {"repositories": {"self": {"refName": selected_branch}}}, | ||||||
| } | ||||||
|
|
||||||
| if pipeline_metadata.parameters: | ||||||
| payload["templateParameters"] = pipeline_metadata.parameters | ||||||
|
|
||||||
| with tempfile.NamedTemporaryFile() as payload_file: | ||||||
| payload_file.write(json.dumps(payload).encode("utf-8")) | ||||||
| payload_file.flush() | ||||||
|
|
||||||
| cmd = [ | ||||||
| "az", | ||||||
| "devops", | ||||||
| "invoke", | ||||||
| "--org", | ||||||
| "https://dev.azure.com/mariner-org", | ||||||
| "--api-version", | ||||||
| "7.0", | ||||||
| "--area", | ||||||
| "pipelines", | ||||||
| "--resource", | ||||||
| "runs", | ||||||
| "--route-parameters", | ||||||
| f"project={pipeline_metadata.project}", | ||||||
| f"pipelineId={pipeline_metadata.id}", | ||||||
| "--http-method", | ||||||
| "POST", | ||||||
| "--in-file", | ||||||
| payload_file.name, | ||||||
| ] | ||||||
| output = subprocess.run( | ||||||
| cmd, | ||||||
| capture_output=True, | ||||||
| ) | ||||||
|
|
||||||
| if output.returncode != 0: | ||||||
| print("Failed to preview pipeline:", file=sys.stderr) | ||||||
| print(output.stderr.decode("utf-8"), file=sys.stderr) | ||||||
| exit(1) | ||||||
|
|
||||||
| print("Pipeline previewed successfully", file=sys.stderr) | ||||||
|
|
||||||
| if not args.quiet: | ||||||
| out_json = json.loads(output.stdout.decode("utf-8")) | ||||||
| print(out_json["finalYaml"]) | ||||||
| if args.parallel: | ||||||
| import concurrent.futures | ||||||
|
|
||||||
| with concurrent.futures.ThreadPoolExecutor() as executor: | ||||||
| futures = { | ||||||
| executor.submit(check_pipeline, name, selected_branch): name | ||||||
|
||||||
| executor.submit(check_pipeline, name, selected_branch): name | |
| executor.submit(check_pipeline, name, selected_branch, args.quiet): name |
frhuelsz marked this conversation as resolved.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error message could be more descriptive about why
--parallelrequires--quiet. Consider expanding it to explain that parallel execution may interleave output, making it unreadable without the quiet flag.