From 622a1a3735a53822dc89b6fe49087e9390a987e3 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Sat, 4 May 2024 09:49:00 +0100
Subject: [PATCH] tests: Serialise the live migration/upgrade NUMA/balloon
 tests

These tests use relatively large memory allocations and if they are
allowed to run in parallel can result in the container encountering an
OOM situation.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 tests/integration.rs | 76 ++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/tests/integration.rs b/tests/integration.rs
index c6f951464..86fe70e03 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -9724,18 +9724,6 @@ mod live_migration {
             _test_live_migration(false, true)
         }
 
-        #[test]
-        #[cfg(not(feature = "mshv"))]
-        fn test_live_migration_numa() {
-            _test_live_migration_numa(false, false)
-        }
-
-        #[test]
-        #[cfg(not(feature = "mshv"))]
-        fn test_live_migration_numa_local() {
-            _test_live_migration_numa(false, true)
-        }
-
         #[test]
         fn test_live_migration_watchdog() {
             _test_live_migration_watchdog(false, false)
@@ -9746,16 +9734,6 @@ mod live_migration {
             _test_live_migration_watchdog(false, true)
         }
 
-        #[test]
-        fn test_live_migration_balloon() {
-            _test_live_migration_balloon(false, false)
-        }
-
-        #[test]
-        fn test_live_migration_balloon_local() {
-            _test_live_migration_balloon(false, true)
-        }
-
         #[test]
         fn test_live_upgrade_basic() {
             _test_live_migration(true, false)
@@ -9766,18 +9744,6 @@ mod live_migration {
             _test_live_migration(true, true)
         }
 
-        #[test]
-        #[cfg(not(feature = "mshv"))]
-        fn test_live_upgrade_numa() {
-            _test_live_migration_numa(true, false)
-        }
-
-        #[test]
-        #[cfg(not(feature = "mshv"))]
-        fn test_live_upgrade_numa_local() {
-            _test_live_migration_numa(true, true)
-        }
-
         #[test]
         fn test_live_upgrade_watchdog() {
             _test_live_migration_watchdog(true, false)
@@ -9787,6 +9753,22 @@ mod live_migration {
         fn test_live_upgrade_watchdog_local() {
             _test_live_migration_watchdog(true, true)
         }
+    }
+
+    mod live_migration_sequential {
+        use super::*;
+
+        // NUMA & baalloon live migration tests are large so run sequentially
+
+        #[test]
+        fn test_live_migration_balloon() {
+            _test_live_migration_balloon(false, false)
+        }
+
+        #[test]
+        fn test_live_migration_balloon_local() {
+            _test_live_migration_balloon(false, true)
+        }
 
         #[test]
         fn test_live_upgrade_balloon() {
@@ -9797,12 +9779,30 @@ mod live_migration {
         fn test_live_upgrade_balloon_local() {
             _test_live_migration_balloon(true, true)
         }
-    }
 
-    mod live_migration_sequential {
-        #[cfg(target_arch = "x86_64")]
+        #[test]
         #[cfg(not(feature = "mshv"))]
-        use super::*;
+        fn test_live_migration_numa() {
+            _test_live_migration_numa(false, false)
+        }
+
+        #[test]
+        #[cfg(not(feature = "mshv"))]
+        fn test_live_migration_numa_local() {
+            _test_live_migration_numa(false, true)
+        }
+
+        #[test]
+        #[cfg(not(feature = "mshv"))]
+        fn test_live_upgrade_numa() {
+            _test_live_migration_numa(true, false)
+        }
+
+        #[test]
+        #[cfg(not(feature = "mshv"))]
+        fn test_live_upgrade_numa_local() {
+            _test_live_migration_numa(true, true)
+        }
 
         // Require to run ovs-dpdk tests sequentially because they rely on the same ovs-dpdk setup
         #[test]