mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
tests: Adjust docker for mac build test to chance of location
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
parent
8028f68e0a
commit
d11fe6ba9a
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SUMMARY: Test the Docker for Mac blueprint
|
# SUMMARY: Test the Docker for Mac example
|
||||||
# LABELS: amd64
|
# LABELS: amd64
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
@ -17,7 +17,7 @@ clean_up() {
|
|||||||
trap clean_up EXIT
|
trap clean_up EXIT
|
||||||
|
|
||||||
# Test code goes here
|
# 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
|
exit 0
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -11,7 +11,6 @@ group_init() {
|
|||||||
[ -r "${LINUXKIT_TMPDIR}" ] && rm -rf "${LINUXKIT_TMPDIR}"
|
[ -r "${LINUXKIT_TMPDIR}" ] && rm -rf "${LINUXKIT_TMPDIR}"
|
||||||
mkdir "${LINUXKIT_TMPDIR}"
|
mkdir "${LINUXKIT_TMPDIR}"
|
||||||
echo "export LINUXKIT_EXAMPLES_DIR=${RT_PROJECT_ROOT}/../../examples" >> "${LINUXKIT_TMPDIR}/env.sh"
|
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 rt_label_set "gcp"; then
|
||||||
# If we run GCP tests, make sure it is configured
|
# If we run GCP tests, make sure it is configured
|
||||||
|
Loading…
Reference in New Issue
Block a user