fix(qa): keep OTEL smoke output repo-relative

RomneyDa · RomneyDa · commit 59b9f266348c · 2026-07-03T20:40:55.000-07:00
diff --git a/test/e2e/qa-lab/runtime/qa-otel-smoke-runtime.ts b/test/e2e/qa-lab/runtime/qa-otel-smoke-runtime.ts
@@ -1505,7 +1505,15 @@ function buildQaEnv(port: number): NodeJS.ProcessEnv {
   return env;
 }
 
-function buildQaArgs(options: CliOptions): string[] {
+function resolveQaOutputDir(outputDir: string, repoRoot = process.cwd()): string {
+  const relative = path.relative(repoRoot, path.resolve(repoRoot, outputDir));
+  if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+    throw new Error("--output-dir must stay within the repo root");
+  }
+  return relative ? relative.split(path.sep).join("/") : ".";
+}
+
+function buildQaArgs(options: CliOptions, repoRoot = process.cwd()): string[] {
   const args = [
     "qa",
     "suite",
@@ -1516,7 +1524,7 @@ function buildQaArgs(options: CliOptions): string[] {
     "--concurrency",
     "1",
     "--output-dir",
-    options.outputDir,
+    resolveQaOutputDir(options.outputDir, repoRoot),
     "--fast",
   ];
   if (options.primaryModel) {
@@ -2018,6 +2026,7 @@ export const testing = {
   appendGatewayStdoutArtifactLogs,
   appendCapturedBodyText,
   assertSmoke,
+  buildQaArgs,
   buildQaEnv,
   createBoundedTextAccumulator,
   createStdoutDiagnosticLogCapture,
diff --git a/test/e2e/qa-lab/runtime/qa-otel-smoke.e2e.test.ts b/test/e2e/qa-lab/runtime/qa-otel-smoke.e2e.test.ts
@@ -200,6 +200,27 @@ describe("qa-otel-smoke receiver bounds", () => {
     );
   });
 
+  it("passes a repo-relative output dir to the child QA suite", () => {
+    const repoRoot = path.join(path.sep, "repo");
+    const options = testing.parseArgs([
+      "--output-dir",
+      path.join(repoRoot, ".artifacts", "qa-e2e", "otel-smoke"),
+    ]);
+
+    expect(testing.buildQaArgs(options, repoRoot)).toContain(".artifacts/qa-e2e/otel-smoke");
+    const repoRootArgs = testing.buildQaArgs(
+      testing.parseArgs(["--output-dir", repoRoot]),
+      repoRoot,
+    );
+    expect(repoRootArgs[repoRootArgs.indexOf("--output-dir") + 1]).toBe(".");
+    expect(() =>
+      testing.buildQaArgs(
+        testing.parseArgs(["--output-dir", path.join(path.sep, "outside", "otel-smoke")]),
+        repoRoot,
+      ),
+    ).toThrow("--output-dir must stay within the repo root");
+  });
+
   it("parses body-size limit env values as strict positive integers", () => {
     expect(testing.readPositiveIntegerEnv("OTEL_TEST_LIMIT", 64, {})).toBe(64);
     expect(
