tests: Move kernel check test over to use linuxkit org

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

View File

@@ -5,21 +5,21 @@ IMAGE=check
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)
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
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
docker push linuxkit/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@@ -4,7 +4,7 @@ set -e
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)
kernelVersion="$(uname -r)"

View File

@@ -1,15 +1,15 @@
#!/bin/sh
function failed {
printf "Moby test suite FAILED\n"
printf "Kernel config test suite FAILED\n"
/sbin/poweroff -f
}
/check-kernel-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

View File

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