mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-30 12:44:39 +00:00
osbuilder: Drop Go agent support
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:
parent
eac05ad6d6
commit
c867d1e069
@ -43,23 +43,21 @@ if [ -n "${CI:-}" ]; then
|
|||||||
skipWhenTestingAll+=("${distro}")
|
skipWhenTestingAll+=("${distro}")
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "${RUST_AGENT:-}" == "yes" ]; then
|
# add skipForRustDistros to skipWhenTestingAll if it is not
|
||||||
# add skipForRustDistros to skipWhenTestingAll if it is not
|
for td in "${skipForRustDistros[@]}"; do
|
||||||
for td in "${skipForRustDistros[@]}"; do
|
if distro_in_set "${td}" "${skipWhenTestingAll[@]}"; then
|
||||||
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
|
continue
|
||||||
fi
|
fi
|
||||||
# not found in skipWhenTestingAll, add to it
|
skipWhenTestingAll+=("${distro}")
|
||||||
skipWhenTestingAll+=("${td}")
|
|
||||||
done
|
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
|
||||||
fi
|
fi
|
||||||
|
@ -388,9 +388,7 @@ install_image_create_container()
|
|||||||
|
|
||||||
showKataRunFailure=1
|
showKataRunFailure=1
|
||||||
run_mgr reset-config
|
run_mgr reset-config
|
||||||
if [ "${RUST_AGENT:-}" = "yes" ]; then
|
run_mgr enable-vsock
|
||||||
run_mgr enable-vsock
|
|
||||||
fi
|
|
||||||
run_mgr configure-image "$file"
|
run_mgr configure-image "$file"
|
||||||
create_container
|
create_container
|
||||||
showKataRunFailure=
|
showKataRunFailure=
|
||||||
@ -408,9 +406,7 @@ install_initrd_create_container()
|
|||||||
|
|
||||||
showKataRunFailure=1
|
showKataRunFailure=1
|
||||||
run_mgr reset-config
|
run_mgr reset-config
|
||||||
if [ "${RUST_AGENT:-}" = "yes" ]; then
|
run_mgr enable-vsock
|
||||||
run_mgr enable-vsock
|
|
||||||
fi
|
|
||||||
run_mgr configure-initrd "$file"
|
run_mgr configure-initrd "$file"
|
||||||
create_container
|
create_container
|
||||||
showKataRunFailure=
|
showKataRunFailure=
|
||||||
|
Loading…
Reference in New Issue
Block a user