Merge branch 'main' into feat/test-collections

Author: dfrankland

.github/actions/test_ruby_gem_uploads/action.yaml

@@ -24,6 +24,9 @@ inputs:
   platform:
     description: The platform that the gem was built for
     required: true
+  test-collection-id:
+    description: Optional 8 character alphanumeric ID for a test collection
+    required: false
   knapsack-pro-test-suite-token-rspec:
     description: Optional Knapsack Pro test suite token for RSpec
     required: true

.github/workflows/release_ruby_gem.yml

@@ -132,6 +132,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           trunk-token: ${{ secrets.TRUNK_STAGING_ORG_API_TOKEN }}
+          test-collection-id: T5yKSn9h
           platform: ${{ matrix.platform.name }}
           artifact-pattern: cross-gem-${{ matrix.platform.name }}
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}

.github/workflows/ruby.yml

@@ -119,6 +119,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_STAGING_ORG_API_TOKEN }}
           trunk-public-api-address: https://api.trunk-staging.io
           trunk-org-slug: trunk-staging-org
+          test-collection-id: T5yKSn9h
           platform: x86_64-linux
           artifact-pattern: ""
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}

.github/workflows/smoke_test.yml

@@ -173,6 +173,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_STAGING_ORG_API_TOKEN }}
           trunk-public-api-address: https://api.trunk-staging.io
           trunk-org-slug: trunk-staging-org
+          test-collection-id: T5yKSn9h
           platform: x86_64-linux
           artifact-pattern: ""
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}
@@ -199,6 +200,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
           trunk-public-api-address: https://api.trunk.io
           trunk-org-slug: trunk
+          test-collection-id: BiBP2neA
           platform: x86_64-linux
           artifact-pattern: ""
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}

.github/workflows/smoke_test_main.yml

@@ -226,6 +226,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_STAGING_ORG_API_TOKEN }}
           trunk-public-api-address: https://api.trunk-staging.io
           trunk-org-slug: trunk-staging-org
+          test-collection-id: T5yKSn9h
           platform: x86_64-linux
           artifact-pattern: ""
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}
@@ -252,6 +253,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
           trunk-public-api-address: https://api.trunk.io
           trunk-org-slug: trunk
+          test-collection-id: BiBP2neA
           platform: x86_64-linux
           artifact-pattern: ""
           knapsack-pro-test-suite-token-rspec: ${{ secrets.KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC }}

cli/src/upload_command.rs

@@ -72,9 +72,9 @@ pub struct UploadArgs {
     #[arg(long, env = constants::TRUNK_ORG_URL_SLUG_ENV, help = "Organization url slug.")]
     pub org_url_slug: String,
     #[arg(
-        long,
-        env = constants::TRUNK_TEST_COLLECTION_SHORT_ID_ENV,
-        help = "Optional test collection short ID to attach to the uploaded bundle for collection-aware ingestion.",
+        long = "test-collection-id",
+        env = constants::TRUNK_TEST_COLLECTION_ID_ENV,
+        help = "Optional 8 character alphanumeric ID for a test collection.",
         required = false,
         num_args = 1
     )]

cli/tests/upload.rs

@@ -59,7 +59,7 @@ async fn upload_bundle() {
     let assert = command_builder
         .command()
         .env("GITHUB_EXTERNAL_ID", "test-external-id-123")
-        .arg("--test-collection-short-id")
+        .arg("--test-collection-id")
         .arg("tc_123")
         .assert()
         // should fail due to quarantine and succeed without quarantining
@@ -237,10 +237,7 @@ async fn upload_bundle() {
     assert_eq!(test_case_run.codeowners[1].name, "@user2");
 
     let mut expected_command_args = command_builder.build_args();
-    expected_command_args.extend([
-        String::from("--test-collection-short-id"),
-        String::from("tc_123"),
-    ]);
+    expected_command_args.extend([String::from("--test-collection-id"), String::from("tc_123")]);
     assert!(
         debug_props.command_line.ends_with(
             &expected_command_args
@@ -530,7 +527,7 @@ async fn upload_bundle_without_canonical_test_collection_metadata_keeps_bundle_g
 
     CommandBuilder::upload(temp_dir.path(), state.host.clone())
         .command()
-        .arg("--test-collection-short-id")
+        .arg("--test-collection-id")
         .arg("tc_123")
         .assert()
         .failure();

constants/src/lib.rs

@@ -29,7 +29,7 @@ pub const TRUNK_API_CLIENT_RETRY_COUNT_ENV: &str = "TRUNK_API_CLIENT_RETRY_COUNT
 pub const TRUNK_API_TOKEN_ENV: &str = "TRUNK_API_TOKEN";
 pub const TRUNK_PUBLIC_REPO_ID_ENV: &str = "TRUNK_PUBLIC_REPO_ID";
 pub const TRUNK_ORG_URL_SLUG_ENV: &str = "TRUNK_ORG_URL_SLUG";
-pub const TRUNK_TEST_COLLECTION_SHORT_ID_ENV: &str = "TRUNK_TEST_COLLECTION_SHORT_ID";
+pub const TRUNK_TEST_COLLECTION_ID_ENV: &str = "TRUNK_TEST_COLLECTION_ID";
 pub const TRUNK_REPO_ROOT_ENV: &str = "TRUNK_REPO_ROOT";
 pub const TRUNK_REPO_URL_ENV: &str = "TRUNK_REPO_URL";
 pub const TRUNK_REPO_HEAD_SHA_ENV: &str = "TRUNK_REPO_HEAD_SHA";
@@ -63,7 +63,7 @@ pub const TRUNK_ENVS_TO_CAPTURE: &[&str] = &[
     TRUNK_API_CLIENT_RETRY_COUNT_ENV,
     TRUNK_PUBLIC_REPO_ID_ENV,
     TRUNK_ORG_URL_SLUG_ENV,
-    TRUNK_TEST_COLLECTION_SHORT_ID_ENV,
+    TRUNK_TEST_COLLECTION_ID_ENV,
     TRUNK_REPO_ROOT_ENV,
     TRUNK_REPO_URL_ENV,
     TRUNK_REPO_HEAD_SHA_ENV,

rspec-trunk-flaky-tests/lib/trunk_spec_helper.rb

@@ -20,6 +20,7 @@
 #
 # Optional environment variables for configuration:
 #   TRUNK_CODEOWNERS_PATH - Path to CODEOWNERS file
+#   TRUNK_TEST_COLLECTION_ID - Optional 8 character alphanumeric ID for a test collection
 #   TRUNK_VARIANT - Variant name for test results (e.g., 'linux', 'pr-123')
 #   TRUNK_DISABLE_QUARANTINING - Set to 'true' to disable quarantining
 #   TRUNK_ALLOW_EMPTY_TEST_RESULTS - Set to 'true' to allow empty results

test_report/src/report.rs

@@ -696,6 +696,8 @@ impl MutTestReport {
         upload_args.pr_number = env::var(constants::TRUNK_PR_NUMBER_ENV)
             .ok()
             .and_then(|v| v.parse::<usize>().ok());
+        upload_args.test_collection_short_id =
+            env::var(constants::TRUNK_TEST_COLLECTION_ID_ENV).ok();
         let debug_props = BundleMetaDebugProps {
             command_line: self.0.borrow().command.clone(),
             trunk_envs: HashMap::new(),