Merge pull request #3526 from zhsj/replace-hello-image

tests: replace local hello world bundle with busybox bundle
This commit is contained in:
Kir Kolyshkin
2022-07-11 13:48:34 -07:00
committed by GitHub
10 changed files with 11 additions and 16 deletions
+1 -2
View File
@@ -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"* ]]
}
```
+2 -1
View File
@@ -3,7 +3,8 @@
load helpers
function setup() {
setup_hello
setup_busybox
update_config '.process.args = ["/bin/echo", "Hello World"]'
}
function teardown() {
-4
View File
@@ -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"
-5
View File
@@ -564,11 +564,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"
}
+2 -1
View File
@@ -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() {
+2 -1
View File
@@ -3,7 +3,8 @@
load helpers
function setup() {
setup_hello
setup_busybox
update_config '.process.args = ["/bin/echo", "Hello World"]'
}
function teardown() {
+2 -1
View File
@@ -3,7 +3,8 @@
load helpers
function setup() {
setup_hello
setup_busybox
update_config '.process.args = ["/bin/echo", "Hello World"]'
}
function teardown() {
+2 -1
View File
@@ -3,7 +3,8 @@
load helpers
function setup() {
setup_hello
setup_busybox
update_config '.process.args = ["/bin/echo", "Hello World"]'
}
function teardown() {
Binary file not shown.
Binary file not shown.