From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 25 Jun 2015 21:48:20 +0000 (+0200)
Subject: reboot macro
X-Git-Tag: tests-6.0-2~1
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=bdb8fb36df8b66c237bbccf96692517c81c0856d

reboot macro
---

diff --git a/system/AA-bonding.md b/system/AA-bonding.md
index d8ccdc2..2c8ae0d 100644
--- a/system/AA-bonding.md
+++ b/system/AA-bonding.md
@@ -73,11 +73,11 @@ targets like `nodedistro-f22` can be used to change a node's fcdistro
 
 ## testing upgrade (one node)
 
-testing a node upgrade; we start from a f14 myplc and upgrade the node to f22
+testing a node upgrade; we start from a f20 myplc and upgrade the node to f22
 
 ### Init
 
-    f14
+    f20
     bond22
     rung
 
@@ -87,8 +87,24 @@ testing a node upgrade; we start from a f14 myplc and upgrade the node to f22
     
 ### Reinstall - back to square 1
 
-	run nodedistro-f14 reinstall
+	run nodedistro-f20 reinstall
     
+### Complete test sequence (containers)
+
+A fairly decent test suite in this context is to run this
+
+**Subject build is f>=18**
+
+    run nodedistro-f20 reinstall reboot nodedistro-f22 upgrade reboot reinstall reboot
+
+The only thing missing with this is to test bootmanager in the context of a f14 bootCD
+
+### Complete test sequence (mixed vservers+containers)
+
+If on the contrary the build under test is a f14, then run instead this; upgrading a f14 node to f>=18 is not supported due to /vservers being an ext3 filesystem
+
+    run nodedistro-f14 reinstall reboot nodedistro-f22 reinstall reboot upgrade reboot
+
 ### Run bootmanager interactively during upgrade
 To deploy experimental bootmanager code:
 
diff --git a/system/macros.py b/system/macros.py
index 680b022..5c80c91 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -198,7 +198,7 @@ sequences['debug_mode'] = "nodestate-safeboot reset-node ssh-node-debug".split()
 sequences['boot_mode'] = "nodestate-boot reset-node wait-node".split()
 sequences['reinstall'] = "nodestate-reinstall reset-node wait-node".split()
 sequences['upgrade'] = "nodestate-upgrade reset-node wait-node".split()
-
+sequences['reboot'] = "nodestate-boot reset-node wait-node".split()
 
 # maybe not too clear..
 sequences['bonding_node'] = 'node start-node'.split()