github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity

tests: Move kernel check test over to use linuxkit org

Browse Source 
Also some other moby renames.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-04-14 14:12:16 -05:00
parent ee641ba03c
commit 3448a804f1
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -52,7 +52,7 @@ install:
cp -R ./bin/* $(PREFIX)/bin cp -R ./bin/* $(PREFIX)/bin
define check_test_log define check_test_log
@cat $1 |grep -q 'Moby test suite PASSED' @cat $1 |grep -q 'Kernel config test suite PASSED'
endef endef
.PHONY: test-hyperkit .PHONY: test-hyperkit

12
test/check/Makefile
View File

@ -5,21 +5,21 @@ IMAGE=check
default: push default: push
hash: Dockerfile check.sh check-kernel-config.sh etc/moby hash: Dockerfile check.sh check-kernel-config.sh etc/linuxkit
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
tar cf - $^ | docker build --no-cache -t $(IMAGE):build - tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash
push: hash push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash)) docker push linuxkit/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build docker rmi $(IMAGE):build
rm -f hash rm -f hash
tag: hash tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build docker rmi $(IMAGE):build
rm -f hash rm -f hash

2
test/check/check-kernel-config.sh
View File

@ -4,7 +4,7 @@ set -e
echo "starting kernel config sanity test with /proc/config.gz" echo "starting kernel config sanity test with /proc/config.gz"
# decompress /proc/config.gz from the Moby host # decompress /proc/config.gz from the host
UNZIPPED_CONFIG=$(zcat /proc/config.gz) UNZIPPED_CONFIG=$(zcat /proc/config.gz)
kernelVersion="$(uname -r)" kernelVersion="$(uname -r)"

6
test/check/check.sh
View File

@ -1,15 +1,15 @@
#!/bin/sh #!/bin/sh
function failed { function failed {
printf "Moby test suite FAILED\n" printf "Kernel config test suite FAILED\n"
/sbin/poweroff -f /sbin/poweroff -f
} }
/check-kernel-config.sh || failed /check-kernel-config.sh || failed
bash /check-config.sh || failed bash /check-config.sh || failed
printf "Moby test suite PASSED\n" printf "Kernel config test suite PASSED\n"
cat /etc/moby cat /etc/linuxkit
/sbin/poweroff -f /sbin/poweroff -f

1
test/check/etc/moby → test/check/etc/linuxkit
View File

@ -7,4 +7,3 @@
\______ o __/ \______ o __/
\ \ __/ \ \ __/
\____\_______/ \____\_______/

10
test/test.yml
View File

@ -1,11 +1,11 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa" image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa"
@ -19,7 +19,7 @@ onboot:
net: host net: host
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: check - name: check
image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f" image: "linuxkit/check:43c4147dda4e02d066ef158cd81718dbff8c8bd0"
pid: host pid: host
capabilities: capabilities:
- CAP_SYS_BOOT - CAP_SYS_BOOT