github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 11:36:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #249 from GabyCT/topic/modifytest

Browse Source 
test: Modify test_images script to handle FC
This commit is contained in:
James O. D. Hunt 2019-03-21 17:04:32 +00:00 committed by GitHub
commit e1eb28836a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test_images.sh
View File

@ -111,11 +111,13 @@ show_stats()
done done
# initrds # initrds
if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
for name in "${!built_initrds[@]}" for name in "${!built_initrds[@]}"
do do
sizes=${built_initrds[$name]} sizes=${built_initrds[$name]}
add_to_stats_file "$tmpfile" "$name" "$sizes" 'initrd' add_to_stats_file "$tmpfile" "$name" "$sizes" 'initrd'
done done
fi
info "Image and rootfs sizes (in bytes and MB), smallest image first:" info "Image and rootfs sizes (in bytes and MB), smallest image first:"
echo echo
@ -221,6 +223,7 @@ set_runtime()
# Travis doesn't support VT-x # Travis doesn't support VT-x
[ -n "${TRAVIS:-}" ] && return [ -n "${TRAVIS:-}" ] && return
if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
if [ -f "$sysconfig_docker_config_file" ]; then if [ -f "$sysconfig_docker_config_file" ]; then
docker_config_file="$sysconfig_docker_config_file" docker_config_file="$sysconfig_docker_config_file"
sed_script="s|^( *DOCKER_OPTS=.+--default-runtime[= ] *)[^ \"]+(.*\"$)|\1${name}\2|g" sed_script="s|^( *DOCKER_OPTS=.+--default-runtime[= ] *)[^ \"]+(.*\"$)|\1${name}\2|g"
@ -232,6 +235,7 @@ set_runtime()
sudo -E sed -i -E "$sed_script" "$docker_config_file" sudo -E sed -i -E "$sed_script" "$docker_config_file"
sudo -E systemctl daemon-reload sudo -E systemctl daemon-reload
sudo -E systemctl restart docker sudo -E systemctl restart docker
fi
} }
setup() setup()
@ -506,11 +510,13 @@ test_distros()
bgJobs+=($!) bgJobs+=($!)
fi fi
if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
if [ ${#distrosAgent[@]} -gt 0 ]; then if [ ${#distrosAgent[@]} -gt 0 ]; then
info "building all rootfses with kata-agent as init" info "building all rootfses with kata-agent as init"
make_rootfs ${commonMakeVars[@]} AGENT_INIT=yes "${distrosAgent[@]}" & make_rootfs ${commonMakeVars[@]} AGENT_INIT=yes "${distrosAgent[@]}" &
bgJobs+=($!) bgJobs+=($!)
fi fi
fi
# Check for build failures (`wait` remembers up to CHILD_MAX bg processes exit status) # Check for build failures (`wait` remembers up to CHILD_MAX bg processes exit status)
for j in ${bgJobs[@]}; do for j in ${bgJobs[@]}; do
@ -556,6 +562,8 @@ test_distros()
continue continue
fi fi
if [ "$KATA_HYPERVISOR" != "firecracker" ]; then
echo -e "$separator" echo -e "$separator"
info "Making initrd image for ${d}" info "Making initrd image for ${d}"
make_initrd ${commonMakeVars[@]} AGENT_INIT=yes $d make_initrd ${commonMakeVars[@]} AGENT_INIT=yes $d
@ -565,6 +573,7 @@ test_distros()
built_initrds["${d}"]="${rootfs_size}:${initrd_size}" built_initrds["${d}"]="${rootfs_size}:${initrd_size}"
info "Creating container for ${d}" info "Creating container for ${d}"
install_initrd_create_container $initrd_path install_initrd_create_container $initrd_path
fi
done done
echo -e "$separator" echo -e "$separator"