Skip to content
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

Store test diffs in job summaries and improve analysis formatting #138531

Merged
merged 13 commits into from
Mar 18, 2025
Merged
Prev Previous commit
Next Next commit
Reformat code
Kobzol committed Mar 15, 2025
commit 4801dba9af6e6c1b3bb06959893f68ed031f6325
10 changes: 6 additions & 4 deletions src/ci/citool/src/analysis.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
use crate::metrics;
use crate::metrics::{JobMetrics, JobName, get_test_suites};
use crate::utils::{output_details, pluralize};
use std::collections::{BTreeMap, HashMap, HashSet};

use build_helper::metrics::{
BuildStep, JsonRoot, TestOutcome, TestSuite, TestSuiteMetadata, format_build_steps,
};
use std::collections::{BTreeMap, HashMap, HashSet};

use crate::metrics;
use crate::metrics::{JobMetrics, JobName, get_test_suites};
use crate::utils::{output_details, pluralize};

pub fn output_bootstrap_stats(metrics: &JsonRoot) {
if !metrics.invocations.is_empty() {
2 changes: 1 addition & 1 deletion src/ci/citool/src/main.rs
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ use std::collections::{BTreeMap, HashMap};
use std::path::{Path, PathBuf};
use std::process::Command;

use analysis::output_bootstrap_stats;
use anyhow::Context;
use clap::Parser;
use jobs::JobDatabase;
@@ -20,7 +21,6 @@ use crate::datadog::upload_datadog_metric;
use crate::jobs::RunType;
use crate::metrics::{JobMetrics, download_auto_job_metrics, download_job_metrics, load_metrics};
use crate::utils::{load_env_var, output_details};
use analysis::output_bootstrap_stats;

const CI_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/..");
const DOCKER_DIRECTORY: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../docker");
5 changes: 3 additions & 2 deletions src/ci/citool/src/metrics.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use std::collections::HashMap;
use std::path::Path;

use crate::jobs::JobDatabase;
use anyhow::Context;
use build_helper::metrics::{JsonNode, JsonRoot, TestSuite};
use std::collections::HashMap;

use crate::jobs::JobDatabase;

pub type JobName = String;

Loading