mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
Merge pull request #3526 from zhsj/replace-hello-image
tests: replace local hello world bundle with busybox bundle
This commit is contained in:
@@ -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"* ]]
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
load helpers
|
||||
|
||||
function setup() {
|
||||
setup_hello
|
||||
setup_busybox
|
||||
update_config '.process.args = ["/bin/echo", "Hello World"]'
|
||||
}
|
||||
|
||||
function teardown() {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
load helpers
|
||||
|
||||
function setup() {
|
||||
setup_hello
|
||||
setup_busybox
|
||||
update_config '.process.args = ["/bin/echo", "Hello World"]'
|
||||
}
|
||||
|
||||
function teardown() {
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
load helpers
|
||||
|
||||
function setup() {
|
||||
setup_hello
|
||||
setup_busybox
|
||||
update_config '.process.args = ["/bin/echo", "Hello World"]'
|
||||
}
|
||||
|
||||
function teardown() {
|
||||
|
||||
@@ -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.
Reference in New Issue
Block a user