github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-28 03:42:09 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: Drop Go agent support

Browse Source 
With Kata 1.x EOL, the Go agent is no more.  So, remove support for it from
the osbuilder scripts.  This removes the RUST_AGENT variable, treating it
as always true.

fixes #2396

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-07-06 17:11:13 +10:00
parent eac05ad6d6
commit c867d1e069
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/osbuilder/tests/test_config.sh
View File

@ -43,23 +43,21 @@ if [ -n "${CI:-}" ]; then
skipWhenTestingAll+=("${distro}")
done
if [ "${RUST_AGENT:-}" == "yes" ]; then
# add skipForRustDistros to skipWhenTestingAll if it is not
for td in "${skipForRustDistros[@]}"; do
if distro_in_set "${td}" "${skipWhenTestingAll[@]}"; then
# add skipForRustDistros to skipWhenTestingAll if it is not
for td in "${skipForRustDistros[@]}"; do
if distro_in_set "${td}" "${skipWhenTestingAll[@]}"; then
continue
fi
# not found in skipWhenTestingAll, add to it
skipWhenTestingAll+=("${td}")
done
if distro_in_set "${arch}" "${skipForRustArch[@]}"; then
for distro in "${test_distros[@]}"; do
if distro_in_set "${distro}" "${skipWhenTestingAll[@]}"; then
continue
fi
# not found in skipWhenTestingAll, add to it
skipWhenTestingAll+=("${td}")
skipWhenTestingAll+=("${distro}")
done
if distro_in_set "${arch}" "${skipForRustArch[@]}"; then
for distro in "${test_distros[@]}"; do
if distro_in_set "${distro}" "${skipWhenTestingAll[@]}"; then
continue
fi
skipWhenTestingAll+=("${distro}")
done
fi
fi
fi

8
tools/osbuilder/tests/test_images.sh
View File

@ -388,9 +388,7 @@ install_image_create_container()
showKataRunFailure=1
run_mgr reset-config
if [ "${RUST_AGENT:-}" = "yes" ]; then
run_mgr enable-vsock
fi
run_mgr enable-vsock
run_mgr configure-image "$file"
create_container
showKataRunFailure=
@ -408,9 +406,7 @@ install_initrd_create_container()
showKataRunFailure=1
run_mgr reset-config
if [ "${RUST_AGENT:-}" = "yes" ]; then
run_mgr enable-vsock
fi
run_mgr enable-vsock
run_mgr configure-initrd "$file"
create_container
showKataRunFailure=