Skip to content

Commit 592e25b

Browse files
crazy-maxiQQBot
authored andcommitted
hack(test): use trap to remove cache volume
Signed-off-by: CrazyMax <[email protected]>
1 parent 2319c65 commit 592e25b

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

hack/test

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ cacheVolume="buildkit-test-cache"
9191
if ! docker container inspect "$cacheVolume" >/dev/null 2>/dev/null; then
9292
docker create -v /root/.cache -v /root/.cache/registry -v /go/pkg/mod --name "$cacheVolume" alpine
9393
fi
94+
if [ "$TEST_KEEP_CACHE" != "1" ]; then
95+
trap 'docker rm -v $cacheVolume' EXIT
96+
fi
9497

9598
if [ "$TEST_INTEGRATION" == 1 ]; then
9699
cid=$(docker create --rm -v /tmp $testReportsVol --volumes-from=$cacheVolume -e CGO_ENABLED -e GITHUB_REF -e ACTIONS_RUNTIME_TOKEN -e ACTIONS_CACHE_URL -e TEST_DOCKERD -e SKIP_INTEGRATION_TESTS -e BUILDKIT_TEST_ENABLE_FEATURES -e BUILDKIT_TEST_DISABLE_FEATURES -e GOTESTSUM_FORMAT ${BUILDKIT_INTEGRATION_SNAPSHOTTER:+"-eBUILDKIT_INTEGRATION_SNAPSHOTTER"} -e BUILDKIT_REGISTRY_MIRROR_DIR=/root/.cache/registry -e BUILDKIT_INTEGRATION_DOCKERD_FLAGS -e GORACE --privileged $iid gotestsum $gotestsumArgs --packages="${TESTPKGS:-./...}" -- $gotestArgs ${TESTFLAGS:--v})
@@ -144,7 +147,3 @@ if [ "$TEST_DOCKERFILE" == 1 ]; then
144147
rm $tarout
145148
done
146149
fi
147-
148-
if [ "$TEST_KEEP_CACHE" != "1" ]; then
149-
docker rm -v $cacheVolume
150-
fi

0 commit comments

Comments
 (0)