From bc185996f906ec93cf81c5f98b44602e4b6e8578 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 22 Nov 2017 19:36:57 +0000 Subject: [PATCH 1/2] example: Update kernel in examples/cadvisor The PR adding cadvisor overlapped with the kernel updates. This brings the example back in line. Signed-off-by: Rolf Neugebauer --- examples/cadvisor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index d32177df1..6e7942902 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 From b7b773d4bad6258bd4dd681373d62ad2de038354 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 22 Nov 2017 19:38:41 +0000 Subject: [PATCH 2/2] tests: Add build test for cadvisor example Signed-off-by: Rolf Neugebauer --- .../100_examples/080_cadvisor/test.sh | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 test/cases/000_build/100_examples/080_cadvisor/test.sh diff --git a/test/cases/000_build/100_examples/080_cadvisor/test.sh b/test/cases/000_build/100_examples/080_cadvisor/test.sh new file mode 100644 index 000000000..d83350f6f --- /dev/null +++ b/test/cases/000_build/100_examples/080_cadvisor/test.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# SUMMARY: Test the cadvisor example +# LABELS: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=cadvisor + +clean_up() { + rm -f ${NAME}* +} + +trap clean_up EXIT + +# Test code goes here +linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml" + +exit 0