github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

tests: Rename docker_build_runtime -> DOCKER_RUNTIME

Browse Source 
DOCKER_RUNTIME is the naming used in the actual osbuilder scripts
for this value. Change the test code to match

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-03-01 17:06:07 -05:00
parent cd46d09e0c
commit e8624d89d9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_images.sh
View File

@ -20,6 +20,7 @@ readonly tests_repo_dir="${script_dir}/../../tests"
readonly mgr="${tests_repo_dir}/cmd/kata-manager/kata-manager.sh" readonly mgr="${tests_repo_dir}/cmd/kata-manager/kata-manager.sh"
readonly test_config=${script_dir}/test_config.sh readonly test_config=${script_dir}/test_config.sh
readonly rootfs_builder=${script_dir}/../rootfs-builder/rootfs.sh readonly rootfs_builder=${script_dir}/../rootfs-builder/rootfs.sh
readonly DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
readonly RUNTIME=${RUNTIME:-kata-runtime} readonly RUNTIME=${RUNTIME:-kata-runtime}
readonly MACHINE_TYPE=`uname -m` readonly MACHINE_TYPE=`uname -m`
readonly CI=${CI:-} readonly CI=${CI:-}
@ -27,9 +28,6 @@ readonly KATA_HYPERVISOR="${KATA_HYPERVISOR:-}"
readonly ci_results_dir="/var/osbuilder/tests" readonly ci_results_dir="/var/osbuilder/tests"
readonly dracut_dir=${script_dir}/../dracut readonly dracut_dir=${script_dir}/../dracut
# "docker build" does not work with a VM-based runtime
readonly docker_build_runtime="runc"
build_images=1 build_images=1
build_initrds=1 build_initrds=1
typeset -a distrosSystemd distrosAgent typeset -a distrosSystemd distrosAgent
@ -286,8 +284,10 @@ setup()
fi fi
silent_run $mgr enable-debug silent_run $mgr enable-debug
# Ensure "docker build" works # "docker build" does not work with a VM-based runtime, and
set_runtime "${docker_build_runtime}" # also does not accept a --runtime option, so our only
# option is to overwrite the system docker default runtime
set_runtime "${DOCKER_RUNTIME}"
} }
# Fetches the distros test configuration from the distro-specific config.sh file. # Fetches the distros test configuration from the distro-specific config.sh file.
@ -635,7 +635,7 @@ test_dracut()
typeset -a dockerRunArgs=(\ typeset -a dockerRunArgs=(\
--rm \ --rm \
--runtime="${docker_build_runtime}" \ --runtime="${DOCKER_RUNTIME}" \
-v "${images_dir}:${images_dir}" \ -v "${images_dir}:${images_dir}" \
-v "${script_dir}/..":"${tmp_dir}" \ -v "${script_dir}/..":"${tmp_dir}" \
-v "${tmp_rootfs}:${tmp_rootfs}" \ -v "${tmp_rootfs}:${tmp_rootfs}" \