@celilo/e2e 0.5.1 → 0.6.0

package/src/runner.ts

@@ -20,6 +20,7 @@
 import { spawn, spawnSync, execSync } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { basename, join, resolve } from 'node:path';
+import { parseLine } from './parse-line';
 
 // ─── Config ──────────────────────────────────────────────────────────
 
@@ -33,6 +34,9 @@ const persistentFile = join(testDir, '.e2e-persistent.json');
 const rawArgs = process.argv.slice(2);
 const flagKeep = rawArgs.includes('--keep');
 const flagReuse = rawArgs.includes('--reuse');
+const flagLive = rawArgs.includes('--live');
+const flagPublished = rawArgs.includes('--published');
+const flagVerbose = rawArgs.includes('--verbose');
 const patterns = rawArgs.filter((a) => !a.startsWith('--'));
 
 // ─── Colors ──────────────────────────────────────────────────────────
@@ -48,7 +52,7 @@ const reset = '\x1b[0m';
 const CLEAR_LINE = '\x1b[2K\r';
 const MOVE_UP = '\x1b[A';
 
-const interactive = process.stdout.isTTY && !process.argv.includes('--no-interactive');
+const interactive = process.stdout.isTTY && !process.argv.includes('--no-interactive') && !flagVerbose;
 
 // ─── Timing ──────────────────────────────────────────────────────────
 
@@ -199,112 +203,66 @@ class ProgressDisplay {
     this.pending = null;
     this.subEventCount = 0;
   }
-}
-
-// ─── Line Parsing ────────────────────────────────────────────────────
 
-function parseLine(line: string, display: ProgressDisplay): void {
-  // Protocol: [progress:start] doing | done
-  const startMatch = line.match(/\[progress:start\] (.*?) \| (.*)/);
-  if (startMatch) {
-    display.startStep(startMatch[1], startMatch[2]);
-    return;
-  }
-
-  // Protocol: [progress:done] optional message
-  const doneMatch = line.match(/\[progress:done\](.*)/);
-  if (doneMatch) {
-    const msg = doneMatch[1].trim();
-    display.doneStep(msg || undefined);
-    return;
-  }
-
-  // Protocol: [progress:fail] message
-  const failMatch = line.match(/\[progress:fail\] (.*)/);
-  if (failMatch) {
-    display.failStep(failMatch[1]);
-    return;
-  }
-
-  // Legacy: [progress] message (treat as instant event)
-  const legacyMatch = line.match(/\[progress\] (.*)/);
-  if (legacyMatch) {
-    display.instantEvent(legacyMatch[1]);
-    return;
-  }
-
-  // Celilo CLI signals — shown as sub-events under the current step.
-  // These must NOT finalize the test's progress step.
-  const deployMatch = line.match(/Module '([^']+)' deployed successfully/);
-  if (deployMatch) {
-    display.subEvent(`${green}✔${reset} ${deployMatch[1]} deployed`);
-    return;
-  }
-
-  const importMatch = line.match(/Successfully imported module: (\S+)/);
-  if (importMatch) {
-    display.subEvent(`${green}✔${reset} ${importMatch[1]} imported`);
-    return;
-  }
-
-  if (line.includes('Deploying software')) {
-    display.subEvent('running Ansible');
-    return;
-  }
-  if (line.includes('Infrastructure selected')) {
-    display.subEvent('infrastructure selected');
-    return;
-  }
-  if (line.includes('Terraform skipped')) {
-    display.subEvent('terraform skipped (existing machine)');
-    return;
-  }
-  if (line.includes('terraform init') || line.includes('Terraform init')) {
-    display.subEvent('running terraform init');
-    return;
-  }
-  if (line.includes('terraform apply') || line.includes('Terraform apply')) {
-    display.subEvent('running terraform apply');
-    return;
-  }
-
-  const retryMatch = line.match(/RETRYING.*?(\d+) retries left/);
-  if (retryMatch) {
-    display.subEvent(`health check (${retryMatch[1]} retries left)`);
-    return;
-  }
-
-  // Error lines
-  if (line.includes('Error:') && !line.includes('bun test') && !line.includes('ipv4: Address already')) {
-    const err = line.replace(/.*Error: /, '').slice(0, 70);
-    display.subEvent(`${red}✗${reset} ${err}`);
+  /** Like abandon() but marks the step as failed so the user can see where it broke */
+  abandonFailed() {
+    if (!this.pending) return;
+    this.finalizeFailed(this.pending.doingMsg);
   }
 }
 
 // ─── Error Extraction ────────────────────────────────────────────────
 
+// Strips ANSI escape sequences so pattern matching works on bun's coloured output
+const ANSI_RE = /\x1b\[[0-9;]*m/g;
+function stripAnsi(s: string): string {
+  return s.replace(ANSI_RE, '');
+}
+
 function extractFailureMessage(lines: string[], exitCode: number): string {
-  const errorIdx = lines.findIndex(
-    (l) => l.startsWith('error:') && !l.includes('bun test'),
-  );
+  const plain = lines.map(stripAnsi);
+
+  // bun's own test failure: "✗ test name [Xms]" — extract the failing test name
+  const bunFailIdx = plain.findIndex((l) => /^\s*✗\s+\S/.test(l) && !l.includes('failed ('));
+  if (bunFailIdx >= 0) {
+    const testName = plain[bunFailIdx].replace(/^\s*✗\s+/, '').replace(/\s*\[\d+ms\].*$/, '').trim();
+    // Grab the error detail on the next few lines (bun indents it under the test)
+    const detail = plain
+      .slice(bunFailIdx + 1, bunFailIdx + 6)
+      .map((l) => l.trim())
+      .filter((l) => l.length > 0 && !l.startsWith('at ') && !l.startsWith('│') && l !== '└─')
+      .slice(0, 2)
+      .join(' — ');
+    return detail ? `${testName}: ${detail}` : testName;
+  }
 
+  // "error: ..." lines (may be indented in bun output)
+  const errorIdx = plain.findIndex(
+    (l) => l.trimStart().startsWith('error:') && !l.includes('bun test'),
+  );
   if (errorIdx >= 0) {
-    const context = lines
+    const context = plain
       .slice(errorIdx, errorIdx + 5)
       .map((l) => l.trim())
       .filter((l) => l.length > 0 && !l.startsWith('at '));
     return context.join('\n    ');
   }
 
-  const celiloError = lines.find(
+  const celiloError = plain.find(
     (l) => l.includes('CeliloCommandError') || (l.includes('celilo') && l.includes('failed')),
   );
   if (celiloError) return celiloError.slice(0, 120);
 
-  const timeout = lines.find((l) => l.includes('Timeout') || l.includes('timed out'));
+  const timeout = plain.find((l) => l.includes('Timeout') || l.includes('timed out'));
   if (timeout) return timeout.slice(0, 120);
 
-  return `exit code ${exitCode}`;
+  // Last resort: print the last few non-empty, non-progress lines from the output
+  const tail = plain
+    .filter((l) => l.length > 0 && !l.startsWith('[progress') && !l.startsWith('[e2e:') && !l.startsWith('[ansible:'))
+    .slice(-3)
+    .map((l) => l.trim())
+    .join(' | ');
+  return tail || `exit code ${exitCode}`;
 }
 
 // ─── Test Execution ──────────────────────────────────────────────────
@@ -314,6 +272,8 @@ interface TestResult {
   status: 'pass' | 'fail' | 'suspicious';
   duration: number;
   error?: string;
+  /** Last ~30 lines of raw test output, shown on failure so the user doesn't have to dig in logs */
+  rawTail?: string;
   hadDebugPause?: boolean;
   projectName?: string;
 }
@@ -333,9 +293,19 @@ async function runTest(
   let capturedProjectName: string | undefined;
 
   return new Promise<TestResult>((resolveTest) => {
-    // Env vars let the test detect --keep / --reuse modes
+    // Env vars let the test detect --keep / --reuse / --live / --published modes
     const testEnv: NodeJS.ProcessEnv = { ...process.env };
     if (flagKeep) testEnv.CELILO_E2E_KEEP = '1';
+    if (flagLive) {
+      // Resolve infra root relative to the test directory (sibling repo convention)
+      const inferredRoot = resolve(testDir, '../../infra');
+      testEnv.CELILO_E2E_INFRA_ROOT = existsSync(join(inferredRoot, 'apps', 'celilo'))
+        ? inferredRoot
+        : resolve(PKG_DIR, '..', '..'); // fallback: @celilo/e2e is inside the infra monorepo
+    }
+    if (flagPublished) {
+      testEnv.CELILO_E2E_INFRA_ROOT = ''; // empty = force published mode
+    }
     if (flagReuse) {
       // Read the persistent project and pass it to the test
       try {
@@ -438,7 +408,7 @@ async function runTest(
       if (code === 0) {
         display.flush();
       } else {
-        display.abandon();
+        display.abandonFailed();
       }
 
       writeFileSync(logFile, stdout + '\n---STDERR---\n' + stderr);
@@ -460,6 +430,20 @@ async function runTest(
           resolveTest({ name, status: 'pass', duration, hadDebugPause, projectName: capturedProjectName });
         }
       } else {
+        // Collect a raw tail: strip ANSI, drop internal protocol lines, keep last 30
+        const rawTail = (stdout + stderr)
+          .split('\n')
+          .map(stripAnsi)
+          .map((l) => l.trimEnd())
+          .filter((l) =>
+            l.length > 0 &&
+            !l.startsWith('[progress') &&
+            !l.startsWith('[e2e:') &&
+            !l.startsWith('[ansible:') &&
+            !l.startsWith('[debug:'),
+          )
+          .slice(-30)
+          .join('\n');
         resolveTest({
           name,
           status: 'fail',
@@ -467,6 +451,7 @@ async function runTest(
           hadDebugPause,
           projectName: capturedProjectName,
           error: extractFailureMessage(lines, code ?? 1),
+          rawTail,
         });
       }
     });
@@ -615,6 +600,14 @@ async function main() {
       if (result.error) {
         console.log(`  ${red}  └─ ${result.error}${reset}`);
       }
+      if (result.rawTail) {
+        console.log();
+        console.log(`${dim}  ── test output ──────────────────────────────────────${reset}`);
+        for (const line of result.rawTail.split('\n')) {
+          console.log(`  ${dim}${line}${reset}`);
+        }
+        console.log(`${dim}  ─────────────────────────────────────────────────────${reset}`);
+      }
       failed++;
     }
     console.log();

package/src/types.ts

@@ -4,6 +4,10 @@ export interface MachineSpec {
   name: string;
   ip: string;
   zone: Zone;
+  /** Use the Docker-capable image (normally only app zone; set for internal machines that need Docker) */
+  docker?: boolean;
+  /** Override the Dockerfile used for this machine (relative to the e2e package) */
+  dockerfile?: string;
 }
 
 export type TopologyPreset = 'default' | 'direct-internet';

package/bin/cache-docker-images

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# Pre-pull and save Docker images needed by e2e test modules.
-# Saves them as tarballs that get mounted into app-zone containers
-# for fast loading at boot time.
-#
-# Run this once (or after updating image versions) to populate the cache.
-# Images are stored in e2e/docker-image-cache/
-
-set -e
-
-CACHE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/docker-image-cache"
-mkdir -p "$CACHE_DIR"
-
-IMAGES=(
-  "docker.io/library/postgres:15-alpine"
-  "docker.io/library/redis:alpine"
-  "ghcr.io/goauthentik/server:2024.2.2"
-)
-
-echo "Caching Docker images for e2e tests..."
-echo "Cache directory: $CACHE_DIR"
-echo ""
-
-for image in "${IMAGES[@]}"; do
-  # Create a safe filename from the image name
-  filename=$(echo "$image" | sed 's|[/:]|_|g').tar
-
-  if [[ -f "$CACHE_DIR/$filename" ]]; then
-    echo "✓ $image (already cached)"
-    continue
-  fi
-
-  echo "▸ Pulling $image..."
-  docker pull "$image"
-
-  echo "  Saving to $filename..."
-  docker save "$image" > "$CACHE_DIR/$filename"
-
-  size=$(du -h "$CACHE_DIR/$filename" | cut -f1)
-  echo "✓ $image ($size)"
-done
-
-echo ""
-echo "Cache complete. $(ls "$CACHE_DIR"/*.tar 2>/dev/null | wc -l | tr -d ' ') images cached."
-echo "Total size: $(du -sh "$CACHE_DIR" | cut -f1)"