OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci_run_n_monitor: compile target_jobs_regex only once

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26070>
This commit is contained in:
Eric Engestrom
2023-11-04 14:52:41 +00:00
committed by Marge Bot
parent a5cb331c64
commit 94655ff811
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/ci/ci_run_n_monitor.py
View File

@@ -87,7 +87,7 @@ def pretty_wait(sec: int) -> None:
def monitor_pipeline( def monitor_pipeline(
project, project,
pipeline, pipeline,
target_job: str, target_jobs_regex: re.Pattern,
dependencies, dependencies,
force_manual: bool, force_manual: bool,
stress: int, stress: int,
@@ -98,8 +98,6 @@ def monitor_pipeline(
stress_status_counter = defaultdict(lambda: defaultdict(int)) stress_status_counter = defaultdict(lambda: defaultdict(int))
target_id = None target_id = None
target_jobs_regex = re.compile(target_job.strip())
while True: while True:
to_cancel = [] to_cancel = []
for job in pipeline.jobs.list(all=True, sort="desc"): for job in pipeline.jobs.list(all=True, sort="desc"):
@@ -295,13 +293,13 @@ def parse_args() -> None:
return args return args
def find_dependencies(target_job: str, project_path: str, iid: int) -> set[str]: def find_dependencies(target_jobs_regex: re.Pattern, project_path: str, iid: int) -> set[str]:
gql_instance = GitlabGQL() gql_instance = GitlabGQL()
dag, _ = create_job_needs_dag( dag, _ = create_job_needs_dag(
gql_instance, {"projectPath": project_path.path_with_namespace, "iid": iid} gql_instance, {"projectPath": project_path.path_with_namespace, "iid": iid}
) )
target_dep_dag = filter_dag(dag, target_job) target_dep_dag = filter_dag(dag, target_jobs_regex)
if not target_dep_dag: if not target_dep_dag:
print(Fore.RED + "The job(s) were not found in the pipeline." + Fore.RESET) print(Fore.RED + "The job(s) were not found in the pipeline." + Fore.RESET)
sys.exit(1) sys.exit(1)
@@ -348,14 +346,16 @@ if __name__ == "__main__":
print(f"Revision: {REV}") print(f"Revision: {REV}")
print(f"Pipeline: {pipe.web_url}") print(f"Pipeline: {pipe.web_url}")
target_jobs_regex = re.compile(args.target.strip())
deps = set() deps = set()
if args.target: if args.target:
print("🞋 job: " + Fore.BLUE + args.target + Style.RESET_ALL) print("🞋 job: " + Fore.BLUE + args.target + Style.RESET_ALL)
deps = find_dependencies( deps = find_dependencies(
target_job=args.target, iid=pipe.iid, project_path=cur_project target_job=target_jobs_regex, iid=pipe.iid, project_path=cur_project
) )
target_job_id, ret = monitor_pipeline( target_job_id, ret = monitor_pipeline(
cur_project, pipe, args.target, deps, args.force_manual, args.stress cur_project, pipe, target_jobs_regex, deps, args.force_manual, args.stress
) )
if target_job_id: if target_job_id: