@specific.dev/spectest 0.116.1 → 0.116.2

package/dist/harness/sticky-consumer.js

@@ -127,18 +127,23 @@ export async function collectStickyCache(config, retention, run = exec, usage =
 }, kubernetes) {
     validateStickyConfig(config);
     const buildctl = ["--addr", "tcp://127.0.0.1:1234", "prune"];
-    await run("buildctl", [...buildctl, "--keep-duration", "168h"], 120_000);
-    // Docker's until filter and Created field refer to the publisher's build
-    // date, not our use. Never prune a just-used image merely because it is old.
+    // Docker 29's containerd until filter uses local image-record creation;
+    // inspect's Created uses the publisher's build date. Neither tracks use.
+    // Never prune a just-used image merely because either timestamp is old.
     const protectedImage = (id) => retention.protectedImages.has(id) || kubernetes?.protectedImages.has(id);
     const images = [...retention.images].sort((a, b) => a.lastUsed - b.lastUsed || a.id.localeCompare(b.id));
     const expired = new Set();
     for (const image of images) {
-        if (protectedImage(image.id) || image.lastUsed >= retention.observedAt - 7 * 24 * 60 * 60 * 1000)
+        if (protectedImage(image.id) || image.lastUsed >= retention.observedAt - 6 * 60 * 60 * 1000)
             continue;
         await run("docker", ["image", "rm", "-f", image.id], 120_000);
         expired.add(image.id);
     }
+    // Drop expired image references first so they no longer pin obsolete build
+    // layers. Cache mounts need a longer window: a cached RUN skips mounting
+    // its package cache, even though a later dependency change will need it.
+    await run("buildctl", [...buildctl, "--keep-duration", "6h", "--filter", "type!=exec.cachemount"], 120_000);
+    await run("buildctl", [...buildctl, "--keep-duration", "168h", "--filter", "type==exec.cachemount"], 120_000);
     const withinTarget = (fs) => fs.freeBytes >= config.headroomBytes;
     let fs = await usage();
     if (withinTarget(fs))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specific.dev/spectest",
-  "version": "0.116.1",
+  "version": "0.116.2",
   "description": "Spectest SDK for defining test environments in TypeScript.",
   "type": "module",
   "main": "./dist/index.js",

package/src/harness/sticky-consumer.test.ts

@@ -88,18 +88,32 @@ test("healthy cache keeps recently used images and a cache that cannot shrink is
     .rejects.toThrow("cannot reclaim required write headroom");
 });
 
-test("seven-day expiry uses our last observation and respects image protection", async () => {
+test("six-hour image expiry uses last observation and respects the boundary and image protection", async () => {
   const removed: string[] = [];
   const run = async (command: string, args: string[]) => {
     if (command === "docker" && args[1] === "rm") removed.push(args.at(-1)!);
     return "";
   };
   await collectStickyCache(config, retention([
-    { id: "unused-for-eight-days", lastUsed: now - 8 * 86400_000 },
+    { id: "unused-for-seven-hours", lastUsed: now - 7 * 3600_000 },
+    { id: "exactly-six-hours", lastUsed: now - 6 * 3600_000 },
+    { id: "used-five-hours-ago", lastUsed: now - 5 * 3600_000 },
     { id: "used-today", lastUsed: now },
     { id: "protected", lastUsed: 0 },
   ], ["protected"]), run, async () => ({ totalBytes: 256 * GiB, freeBytes: 220 * GiB }));
-  expect(removed).toEqual(["unused-for-eight-days"]);
+  expect(removed).toEqual(["unused-for-seven-hours"]);
+});
+
+test("publication removes expired images before pruning build records and gives cache mounts seven days", async () => {
+  const calls: string[][] = [];
+  const run = async (command: string, args: string[]) => { calls.push([command, ...args]); return ""; };
+  await collectStickyCache(config, retention([{ id: "superseded", lastUsed: now - 7 * 3600_000 }]),
+    run, async () => ({ totalBytes: 251 * GiB, freeBytes: 170 * GiB }));
+  expect(calls).toEqual([
+    ["docker", "image", "rm", "-f", "superseded"],
+    ["buildctl", "--addr", "tcp://127.0.0.1:1234", "prune", "--keep-duration", "6h", "--filter", "type!=exec.cachemount"],
+    ["buildctl", "--addr", "tcp://127.0.0.1:1234", "prune", "--keep-duration", "168h", "--filter", "type==exec.cachemount"],
+  ]);
 });
 
 test("pressure cannot evict the images used by the environment being published", async () => {

package/src/harness/sticky-consumer.ts

@@ -137,17 +137,22 @@ export async function collectStickyCache(
 ): Promise<void> {
   validateStickyConfig(config);
   const buildctl = ["--addr", "tcp://127.0.0.1:1234", "prune"];
-  await run("buildctl", [...buildctl, "--keep-duration", "168h"], 120_000);
-  // Docker's until filter and Created field refer to the publisher's build
-  // date, not our use. Never prune a just-used image merely because it is old.
+  // Docker 29's containerd until filter uses local image-record creation;
+  // inspect's Created uses the publisher's build date. Neither tracks use.
+  // Never prune a just-used image merely because either timestamp is old.
   const protectedImage = (id: string) => retention.protectedImages.has(id) || kubernetes?.protectedImages.has(id);
   const images = [...retention.images].sort((a, b) => a.lastUsed - b.lastUsed || a.id.localeCompare(b.id));
   const expired = new Set<string>();
   for (const image of images) {
-    if (protectedImage(image.id) || image.lastUsed >= retention.observedAt - 7 * 24 * 60 * 60 * 1000) continue;
+    if (protectedImage(image.id) || image.lastUsed >= retention.observedAt - 6 * 60 * 60 * 1000) continue;
     await run("docker", ["image", "rm", "-f", image.id], 120_000);
     expired.add(image.id);
   }
+  // Drop expired image references first so they no longer pin obsolete build
+  // layers. Cache mounts need a longer window: a cached RUN skips mounting
+  // its package cache, even though a later dependency change will need it.
+  await run("buildctl", [...buildctl, "--keep-duration", "6h", "--filter", "type!=exec.cachemount"], 120_000);
+  await run("buildctl", [...buildctl, "--keep-duration", "168h", "--filter", "type==exec.cachemount"], 120_000);
   const withinTarget = (fs: { freeBytes: number }) => fs.freeBytes >= config.headroomBytes;
   let fs = await usage();
   if (withinTarget(fs)) return;