commit 03f8a143903afef7cef83f2fcf686e56465573ff
author Roy Yang <royyang@google.com> Thu Feb 11 11:48:02 2021 -0800
committer Roy Yang <royyang@google.com> Fri Feb 12 19:17:42 2021 +0000
tree 1cb9350663a8dcb9468a29fef5ddbb988bec5324
parent d98029d1315fca6004ed4242cd552318098b8a77

lakitu: Add arch support when running VMTests

BUG=b/175740674
TEST=Manually
RELEASE_NOTE=None

Change-Id: I0d3d62a0ab95c9920215ca20e3e3f70311cd2836
Reviewed-on: https://cos-review.googlesource.com/c/third_party/platform/crosutils/+/12310
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Tested-by: Roy Yang <royyang@google.com>

cos/run_vmtests.sh

diff --git a/cos/run_vmtests.sh b/cos/run_vmtests.sh
index b37f85f..ee25665 100755
--- a/cos/run_vmtests.sh
+++ b/cos/run_vmtests.sh
@@ -40,10 +40,21 @@
   IMAGE_DIR=${FLAGS_image_dir}
 fi
 
+BOARD_ARCH=$(portageq-${FLAGS_board} envvar ARCH)
+if [[ ${BOARD_ARCH} == "amd64" ]]; then
+  BOARD_ARCH="x86_64"
+elif [[ ${BOARD_ARCH} == "arm64" ]]; then
+  BOARD_ARCH="aarch64"
+else
+  echo "Unsupported ${BOARD_ARCH}"
+  exit 1
+fi
+
 cros_run_vm_test --board ${BOARD} \
   --image-path ${IMAGE_DIR}/chromiumos_${FLAGS_image_type}_image.bin \
   --private-key ${IMAGE_DIR}/id_rsa \
   --test_that-args=--model=ad_hoc_model \
   --copy-on-write \
   --start-vm \
+  --qemu-arch ${BOARD_ARCH} \
   --autotest 'suite:smoke'