Merge pull request #2397 from dgibson/no-go-agent

osbuilder: Drop Go agent support
This commit is contained in:
GabyCT
2021-08-10 09:13:00 -05:00
committed by GitHub
2 changed files with 15 additions and 21 deletions

View File

@@ -43,7 +43,6 @@ 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
@@ -61,5 +60,4 @@ if [ -n "${CI:-}" ]; then
skipWhenTestingAll+=("${distro}") skipWhenTestingAll+=("${distro}")
done done
fi fi
fi
fi fi

View File

@@ -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=