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

tests: Adjust docker for mac build test to chance of location

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-01-19 13:03:10 +00:00
parent 8028f68e0a
commit d11fe6ba9a
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh → test/cases/000_build/100_examples/090_docker_for_mac/test.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
# SUMMARY: Test the Docker for Mac blueprint
# SUMMARY: Test the Docker for Mac example
# LABELS: amd64
set -e
@ -17,7 +17,7 @@ clean_up() {
trap clean_up EXIT
# Test code goes here
linuxkit build -name "${NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${NAME}/docker-ce.yml"
linuxkit build "${LINUXKIT_EXAMPLES_DIR}/${NAME}.yml"
exit 0

31
test/cases/000_build/200_blueprints/group.sh
View File

@ -1,31 +0,0 @@
#!/bin/sh
# SUMMARY: Check that the blueprint YAML files work
# LABELS:
group_init() {
# Group initialisation code goes here
return 0
}
group_deinit() {
# Group de-initialisation code goes here
return 0
}
CMD=$1
case $CMD in
init)
group_init
res=$?
;;
deinit)
group_deinit
res=$?
;;
*)
res=1
;;
esac
exit $res

1
test/cases/group.sh
View File

@ -11,7 +11,6 @@ group_init() {
[ -r "${LINUXKIT_TMPDIR}" ] && rm -rf "${LINUXKIT_TMPDIR}"
mkdir "${LINUXKIT_TMPDIR}"
echo "export LINUXKIT_EXAMPLES_DIR=${RT_PROJECT_ROOT}/../../examples" >> "${LINUXKIT_TMPDIR}/env.sh"
echo "export LINUXKIT_BLUEPRINTS_DIR=${RT_PROJECT_ROOT}/../../blueprints" >> "${LINUXKIT_TMPDIR}/env.sh"
if rt_label_set "gcp"; then
# If we run GCP tests, make sure it is configured