From 27df42255c7d8a176629296e18f2bb69d0624a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Mon, 22 May 2023 11:53:14 +0200 Subject: [PATCH] hack: Rename .ensure-emptyfs to .build-empty-images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski (cherry picked from commit a93aadc2e60ee8b824a26391ff82c35cde2b0cda) Signed-off-by: Paweł Gronowski --- Dockerfile.e2e | 4 ++-- hack/make/{.ensure-emptyfs => .build-empty-images} | 0 hack/make/.integration-daemon-setup | 2 +- hack/test/e2e-run.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename hack/make/{.ensure-emptyfs => .build-empty-images} (100%) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 9dc49e845a..2b41a7e65e 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -71,8 +71,8 @@ RUN apk --no-cache add \ tar \ xz -COPY hack/test/e2e-run.sh /scripts/run.sh -COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh +COPY hack/test/e2e-run.sh /scripts/run.sh +COPY hack/make/.build-empty-images /scripts/build-empty-images.sh COPY integration/testdata /tests/integration/testdata COPY integration/build/testdata /tests/integration/build/testdata diff --git a/hack/make/.ensure-emptyfs b/hack/make/.build-empty-images similarity index 100% rename from hack/make/.ensure-emptyfs rename to hack/make/.build-empty-images diff --git a/hack/make/.integration-daemon-setup b/hack/make/.integration-daemon-setup index c130e23560..4bcc816c2c 100644 --- a/hack/make/.integration-daemon-setup +++ b/hack/make/.integration-daemon-setup @@ -3,5 +3,5 @@ set -e source "$MAKEDIR/.detect-daemon-osarch" if [ "$DOCKER_ENGINE_GOOS" != "windows" ]; then - bundle .ensure-emptyfs + bundle .build-empty-images fi diff --git a/hack/test/e2e-run.sh b/hack/test/e2e-run.sh index 57127c0d18..545504fa0e 100755 --- a/hack/test/e2e-run.sh +++ b/hack/test/e2e-run.sh @@ -81,5 +81,5 @@ set_platform_timeout() { fi } -sh /scripts/ensure-emptyfs.sh +sh /scripts/build-empty-images.sh run_test_integration