summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-10-16 14:11:21 +0300
committerRiku Voipio <riku.voipio@linaro.org>2014-10-20 13:11:02 +0300
commit8f9f3a378d1f4c2cb56684f3b811f2373c5f7f57 (patch)
tree698c2dc19b4bfdeda8466c32db4cedadce48a3af
parent04d06939bf4501d870bc85b4883c9a8909bfb847 (diff)
KVM test fixes
1) CI url changed since the docker migration 2) Use taskset to ensure kvm doesn't migrate A53 -> A57. -> this is ugly and assumes host cpu's don't get renumbered in future. Revisit once kvm supports migration. Change-Id: I454eb1aeba754ce16278fa22d79ae2f8f7042712 Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rwxr-xr-xcommon/scripts/kvm/test-kvm.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/scripts/kvm/test-kvm.sh b/common/scripts/kvm/test-kvm.sh
index 7534999..df04a75 100755
--- a/common/scripts/kvm/test-kvm.sh
+++ b/common/scripts/kvm/test-kvm.sh
@@ -43,7 +43,7 @@ case ${ARCH} in
;;
aarch64)
hwpack=`uname -r|sed -e's,.*-,,'`
- BUILD_NUMBER_HOST=`$(echo $EXTRACT_BUILD_NUMBER) https://ci.linaro.org/job/linux-kvm/hwpack=${hwpack},label=kernel_cloud/lastSuccessfulBuild/buildNumber`
+ BUILD_NUMBER_HOST=`$(echo $EXTRACT_BUILD_NUMBER) https://ci.linaro.org/job/linux-kvm/hwpack=${hwpack},label=docker/lastSuccessfulBuild/buildNumber`
$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm-guest/$BUILD_NUMBER_GUEST/kvm-arm64.qcow2.gz
$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER_HOST/Image-${hwpack}
$DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$BUILD_NUMBER_HOST/nbd-${hwpack}.ko.gz
@@ -125,7 +125,7 @@ qemu-system-arm -smp 2 -m 1024 -cpu cortex-a15 -M vexpress-a15 \
;;
aarch64)
qemu-system-aarch64 --version
-qemu-system-aarch64 -smp 2 -m 1024 -cpu host -M virt \
+taskset -c 0,1,2,3 qemu-system-aarch64 -smp 2 -m 1024 -cpu host -M virt \
-kernel ./Image-${hwpack} \
-append 'root=/dev/vda2 rw rootwait mem=1024M earlyprintk=pl011,0x9000000 console=ttyAMA0,38400n8' \
-drive if=none,id=image,file=kvm.qcow2 \