From 88bbf7989a8b1fab4b9a4d9fc46ecc1aa2219491 Mon Sep 17 00:00:00 2001
From: Michael Zhao <michael.zhao@arm.com>
Date: Sun, 21 Aug 2022 21:38:12 +0800
Subject: [PATCH] tests: Enable live upgrade tests on AArch64

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
---
 scripts/run_integration_tests_aarch64.sh | 2 +-
 tests/integration.rs                     | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh
index 36f9dcb93..0003181ea 100755
--- a/scripts/run_integration_tests_aarch64.sh
+++ b/scripts/run_integration_tests_aarch64.sh
@@ -148,7 +148,7 @@ update_workloads() {
     popd
 
     # Download Cloud Hypervisor binary from its last stable release
-    LAST_RELEASE_VERSION="v23.0"
+    LAST_RELEASE_VERSION="v26.0"
     CH_RELEASE_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$LAST_RELEASE_VERSION/cloud-hypervisor-static-aarch64"
     CH_RELEASE_NAME="cloud-hypervisor-static-aarch64"
     pushd $WORKLOADS_DIR
diff --git a/tests/integration.rs b/tests/integration.rs
index 6b40acb04..9d79787e6 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -8927,51 +8927,43 @@ mod live_migration {
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_basic() {
             _test_live_migration(true, false, false, false, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_local() {
             _test_live_migration(true, false, true, false, false)
         }
 
         #[test]
         #[cfg(not(feature = "mshv"))]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_numa() {
             _test_live_migration(true, true, false, false, false)
         }
 
         #[test]
         #[cfg(not(feature = "mshv"))]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_numa_local() {
             _test_live_migration(true, true, true, false, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_watchdog() {
             _test_live_migration(true, false, false, true, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_watchdog_local() {
             _test_live_migration(true, false, true, true, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_balloon() {
             _test_live_migration(true, false, false, false, true)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_live_upgrade_balloon_local() {
             _test_live_migration(true, false, true, false, true)
         }