diff --git a/bin/ci/ci_run_n_monitor.py b/bin/ci/ci_run_n_monitor.py index 5085fd5075a..da29b83d1d8 100755 --- a/bin/ci/ci_run_n_monitor.py +++ b/bin/ci/ci_run_n_monitor.py @@ -136,7 +136,7 @@ def monitor_pipeline( while True: deps_failed = [] to_cancel = [] - for job in pipeline.jobs.list(all=True, sort="desc"): + for job in sorted(pipeline.jobs.list(all=True), key=lambda j: j.name): # target jobs if target_jobs_regex.fullmatch(job.name): target_id = job.id @@ -175,7 +175,7 @@ def monitor_pipeline( if stress: enough = True - for job_name, status in stress_status_counter.items(): + for job_name, status in sorted(stress_status_counter.items()): print( f"* {job_name:{name_field_pad}}succ: {status['success']}; " f"fail: {status['failed']}; " diff --git a/bin/ci/gitlab_gql.py b/bin/ci/gitlab_gql.py index eefdf214dd7..bb988313b90 100755 --- a/bin/ci/gitlab_gql.py +++ b/bin/ci/gitlab_gql.py @@ -331,10 +331,8 @@ def filter_dag(dag: Dag, regex: Pattern) -> Dag: def print_dag(dag: Dag) -> None: - for job, data in dag.items(): - print(f"{job}:") - print(f"\t{' '.join(data['needs'])}") - print() + for job, data in sorted(dag.items()): + print(f"{job}:\n\t{' '.join(data['needs'])}\n") def fetch_merged_yaml(gl_gql: GitlabGQL, params) -> dict[str, Any]: