diff --git a/tests/integration/README.md b/tests/integration/README.md index 6d0201c16fb..8712caef428 100644 --- a/tests/integration/README.md +++ b/tests/integration/README.md @@ -60,7 +60,7 @@ load helpers # setup is called at the beginning of every test. function setup() { - setup_hello + setup_busybox } # teardown is called at the end of every test. @@ -77,5 +77,4 @@ function teardown() { # check expected output [[ "${output}" == *"Hello"* ]] } - ``` diff --git a/tests/integration/debug.bats b/tests/integration/debug.bats index 333745e3969..9db676b89b2 100644 --- a/tests/integration/debug.bats +++ b/tests/integration/debug.bats @@ -3,7 +3,8 @@ load helpers function setup() { - setup_hello + setup_busybox + update_config '.process.args = ["/bin/echo", "Hello World"]' } function teardown() { diff --git a/tests/integration/get-images.sh b/tests/integration/get-images.sh index 9f1bf96add2..63ce40cdad1 100755 --- a/tests/integration/get-images.sh +++ b/tests/integration/get-images.sh @@ -64,7 +64,3 @@ DEBIAN_IMAGE="$TESTDATA/debian-${arch}.tar.xz" get "$DEBIAN_IMAGE" \ "https://github.com/debuerreotype/docker-debian-artifacts/raw/dist-${arch}/buster/slim/rootfs.tar.xz" echo "DEBIAN_IMAGE=$DEBIAN_IMAGE" - -# hello-world is local, no need to download. -HELLO_IMAGE="$TESTDATA/hello-world-${arch}.tar" -echo "HELLO_IMAGE=$HELLO_IMAGE" diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash index b55d1056e81..05d94f7fa84 100644 --- a/tests/integration/helpers.bash +++ b/tests/integration/helpers.bash @@ -569,11 +569,6 @@ function setup_busybox() { setup_bundle "$BUSYBOX_IMAGE" } -function setup_hello() { - setup_bundle "$HELLO_IMAGE" - update_config '(.. | select(.? == "sh")) |= "/hello"' -} - function setup_debian() { setup_bundle "$DEBIAN_IMAGE" } diff --git a/tests/integration/mounts_sshfs.bats b/tests/integration/mounts_sshfs.bats index abf82357d51..41f1cf4ebc9 100644 --- a/tests/integration/mounts_sshfs.bats +++ b/tests/integration/mounts_sshfs.bats @@ -16,7 +16,8 @@ function setup() { skip "test requires working sshfs mounts" fi - setup_hello + setup_busybox + update_config '.process.args = ["/bin/echo", "Hello World"]' } function teardown() { diff --git a/tests/integration/run.bats b/tests/integration/run.bats index 63be89d2c7a..420040a52ed 100644 --- a/tests/integration/run.bats +++ b/tests/integration/run.bats @@ -3,7 +3,8 @@ load helpers function setup() { - setup_hello + setup_busybox + update_config '.process.args = ["/bin/echo", "Hello World"]' } function teardown() { diff --git a/tests/integration/spec.bats b/tests/integration/spec.bats index b24c6b7142f..8091ba339a5 100644 --- a/tests/integration/spec.bats +++ b/tests/integration/spec.bats @@ -3,7 +3,8 @@ load helpers function setup() { - setup_hello + setup_busybox + update_config '.process.args = ["/bin/echo", "Hello World"]' } function teardown() { diff --git a/tests/integration/start_hello.bats b/tests/integration/start_hello.bats index 1c3c906fa53..ae138c9c58e 100644 --- a/tests/integration/start_hello.bats +++ b/tests/integration/start_hello.bats @@ -3,7 +3,8 @@ load helpers function setup() { - setup_hello + setup_busybox + update_config '.process.args = ["/bin/echo", "Hello World"]' } function teardown() { diff --git a/tests/integration/testdata/hello-world-amd64.tar b/tests/integration/testdata/hello-world-amd64.tar deleted file mode 100644 index aec830e2ec6..00000000000 Binary files a/tests/integration/testdata/hello-world-amd64.tar and /dev/null differ diff --git a/tests/integration/testdata/hello-world-arm64v8.tar b/tests/integration/testdata/hello-world-arm64v8.tar deleted file mode 100644 index 186c8aefc47..00000000000 Binary files a/tests/integration/testdata/hello-world-arm64v8.tar and /dev/null differ