From f5abb168e3009456e3c131e2dcf5c24bc89e5929 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Fri, 3 May 2024 20:46:52 +0100
Subject: [PATCH] tests: Re-enable live upgrade tests

And bump release verion used to v39.0

Fixes: #6134

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 scripts/run_integration_tests_aarch64.sh        | 2 +-
 scripts/run_integration_tests_live_migration.sh | 2 +-
 tests/integration.rs                            | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh
index debc11f76..3d485716e 100755
--- a/scripts/run_integration_tests_aarch64.sh
+++ b/scripts/run_integration_tests_aarch64.sh
@@ -134,7 +134,7 @@ update_workloads() {
     popd || exit
 
     # Download Cloud Hypervisor binary from its last stable release
-    LAST_RELEASE_VERSION="v36.0"
+    LAST_RELEASE_VERSION="v39.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" || exit
diff --git a/scripts/run_integration_tests_live_migration.sh b/scripts/run_integration_tests_live_migration.sh
index 5448a12f1..84986474b 100755
--- a/scripts/run_integration_tests_live_migration.sh
+++ b/scripts/run_integration_tests_live_migration.sh
@@ -45,7 +45,7 @@ fi
 popd || exit
 
 # Download Cloud Hypervisor binary from its last stable release
-LAST_RELEASE_VERSION="v36.0"
+LAST_RELEASE_VERSION="v39.0"
 CH_RELEASE_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$LAST_RELEASE_VERSION/cloud-hypervisor-static"
 CH_RELEASE_NAME="cloud-hypervisor-static"
 pushd "$WORKLOADS_DIR" || exit
diff --git a/tests/integration.rs b/tests/integration.rs
index df65cfdb5..c6f951464 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -9757,51 +9757,43 @@ mod live_migration {
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_basic() {
             _test_live_migration(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_local() {
             _test_live_migration(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         #[cfg(not(feature = "mshv"))]
         fn test_live_upgrade_numa() {
             _test_live_migration_numa(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         #[cfg(not(feature = "mshv"))]
         fn test_live_upgrade_numa_local() {
             _test_live_migration_numa(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_watchdog() {
             _test_live_migration_watchdog(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_watchdog_local() {
             _test_live_migration_watchdog(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_balloon() {
             _test_live_migration_balloon(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_balloon_local() {
             _test_live_migration_balloon(true, true)
         }