@norskvideo/ctl-test-harness 0.1.45 → 0.1.46

package/container-logs.js

@@ -125,14 +125,28 @@ export function preserveEngineLogs(runtimeRoot, dest) {
                 continue;
             }
             if (name === "logs") {
-                // Copy the whole tree wholesale; don't descend further.
+                // Copy the tree, but CHILD BY CHILD: a root-owned sibling (e.g. studio
+                // logs when studio runs as root) must not abort the copy of the media
+                // logs we came for. Don't descend further past a logs/ dir.
+                let children;
                 try {
-                    cpSync(p, join(dest, relative(runtimeRoot, p)), { recursive: true });
-                    copied += 1;
+                    children = readdirSync(p);
                 }
                 catch {
-                    /* best-effort */
+                    continue;
                 }
+                let any = false;
+                for (const child of children) {
+                    try {
+                        cpSync(join(p, child), join(dest, relative(runtimeRoot, p), child), { recursive: true });
+                        any = true;
+                    }
+                    catch {
+                        /* best-effort per child */
+                    }
+                }
+                if (any)
+                    copied += 1;
             }
             else {
                 walk(p);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-test-harness",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "type": "module",
   "exports": {
     ".": {

package/smoke.js

@@ -392,14 +392,17 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
         journeyError = e;
     }
     // Preserve the engine logs BEFORE anything tears the store down. norsk-ctl
-    // bind-mounts each media container's /var/log/norsk to the store, so the full
-    // structured debug.json is on disk here -- but `product remove`,
-    // `instance delete --purge`, cleanup and the root nuke below all destroy it.
-    // We pretty much always want the Norsk logs from a smoke run; when a CI log
-    // dir is set, copy every logs/ tree out first so the workflow can upload it.
+    // bind-mounts each media container's /var/log/norsk to <runnerDir>/logs/media,
+    // and runnerDir is <storeDir>/product-instances/<id> -- a SIBLING of the
+    // workdir (:/data, under <storeDir>/norsk-runtime), NOT under it. So walk the
+    // whole storeDir, not just norsk-runtime, or the logs/ tree is never found
+    // (this is why it preserved 0). `product remove`, `instance delete --purge`,
+    // cleanup and the root nuke below all destroy it, and we pretty much always
+    // want the Norsk logs from a smoke run; when a CI log dir is set, copy every
+    // logs/ tree out first so the workflow can upload it.
     const ciLogDir = process.env.NORSK_CI_LOG_DIR;
     if (ciLogDir) {
-        const n = preserveEngineLogs(join(storeDir, "norsk-runtime"), join(ciLogDir, slug));
+        const n = preserveEngineLogs(storeDir, join(ciLogDir, slug));
         deps.log(`${slug}: preserved ${n} engine log tree(s) -> ${join(ciLogDir, slug)}`);
     }
     if (handles.length)