From 03958af886d8f109457f551ae95b81c17bf16ae4 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Fri, 17 Oct 2025 09:28:15 -0400 Subject: [PATCH 1/2] test(spread): speed up the skip-retest spread test Don't restart the container between pack runs and do the clean during restore. --- tests/spread/testcraft/skip-repack/task.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/spread/testcraft/skip-repack/task.yaml b/tests/spread/testcraft/skip-repack/task.yaml index bb9d1d832..04cddcc11 100644 --- a/tests/spread/testcraft/skip-repack/task.yaml +++ b/tests/spread/testcraft/skip-repack/task.yaml @@ -3,6 +3,7 @@ summary: test testcraft pack/repack environment: CRAFT_BUILD_ENVIRONMENT/managed: "" CRAFT_BUILD_ENVIRONMENT/destructive: host + CRAFT_IDLE_MINS/managed: 2 # Speed up test by not restarting the container. execute: | mkdir repack-test @@ -32,7 +33,8 @@ execute: | # Repacking is not necessary testcraft pack 2>&1 | MATCH "Skipping pack" - testcraft clean - restore: | + pushd repack-test + testcraft clean + popd rm -Rf repack-test From 78455993fa21879d023faf289bb43e96cc18de69 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 2 Dec 2025 15:18:41 -0500 Subject: [PATCH 2/2] Move repack-test directory creation to prepare phase (#964) * Initial plan * Move repack-test directory creation to prepare phase Co-authored-by: lengau <4305943+lengau@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: lengau <4305943+lengau@users.noreply.github.com> --- tests/spread/testcraft/skip-repack/task.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/spread/testcraft/skip-repack/task.yaml b/tests/spread/testcraft/skip-repack/task.yaml index f41cca4e8..7718ac756 100644 --- a/tests/spread/testcraft/skip-repack/task.yaml +++ b/tests/spread/testcraft/skip-repack/task.yaml @@ -5,8 +5,10 @@ environment: CRAFT_BUILD_ENVIRONMENT/destructive: host CRAFT_IDLE_MINS/managed: 2 # Speed up test by not restarting the container. -execute: | +prepare: | mkdir repack-test + +execute: | cd repack-test testcraft init