From d5b002515856d50c511ceee6184122e2df234867 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@collabora.com>
Date: Wed, 14 Aug 2019 12:07:41 +0200
Subject: [PATCH] t5868: VirtualBox issue on copying vdi files and other
 improvements

Using the same SDK image to setup old and new VM instance results in a
VirtualBox error:

	Locking of attached media failed. A possible reason is that one of the media is attached to a running VM.
	Result Code:
	VBOX_E_INVALID_OBJECT_STATE (0x80BB0007)
	Component:
	SessionMachine
	Interface:
	IMachine {85cd948e-a71f-4289-281e-0ca7ad48cd89}

This commit change the test case to clone the VM instead of creating two
identical VMs.

This patch also fixes other issues that were pointed out by:

	https://phabricator.apertis.org/T5868#195314

Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
 test-cases/sdk-persistent-disk.yaml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/test-cases/sdk-persistent-disk.yaml b/test-cases/sdk-persistent-disk.yaml
index 0f3eda7..9428f1e 100644
--- a/test-cases/sdk-persistent-disk.yaml
+++ b/test-cases/sdk-persistent-disk.yaml
@@ -15,21 +15,22 @@ metadata:
   pre-conditions:
     - "Download the virtual machine image for the latest SDK release from:"
     - "~https://images.apertis.org/"
-    - "Make a note of the name of the latest Apertis release you used. When calling ade on the terminal replace v2020dev0 by the name of the latest Apertis release."
-    - "Create the first virtual machine and name it old-sdk or old-basesdk"
-    - "Create the second virtual machine and name it new-sdk or new-basesdk"
-    - "Instructions on how to use VirtualBox and psdk for persistent disk:"
+    - "Make a note of release version e.g v2020dev0"
+    - "Create a virtual machine, and name it old-sdk or old-basesdk"
+    - "Create a Full Clone of the virtual machine, and name the clone new-sdk or new-basesdk:"
+    - "~https://www.virtualbox.org/manual/ch01.html#clone"
+    - "Instructions on how to use the SDK persistent workspace on VirtualBox:"
     - "~https://developer.apertis.org/latest/sdk-usage.html#persistent-workspace"
 
   expected:
-    - "psdk should indicate that 'This SDK is currently using the persistent disk' when attempting to confirm if the SDK is using the persistent disk"
-    - "'ade sysroot update' should indicate that the Installed version is already up-to-date."
+    - "When attempting to confirm if the SDK is using the persistent disk psdk should indicate that 'This SDK is currently using the persistent disk'"
+    - "'ade sysroot update' should indicate that the installed version is already up-to-date."
 
 run:
   steps:
     - "The following steps are for the SDK virtual machine named with old:"
-    - "Power on the virtual machine, and run on a terminal(remember to replace v2020dev0):"
-    - $ ade sysroot install --release v2020dev0
+    - "Power on the virtual machine, and run on a terminal:"
+    - $ ade sysroot install --release <release version>
     - "Power off the virtual machine"
     - "On VirtualBox add the persistent disk to the SDK virtual machine:"
     - "~https://developer.apertis.org/latest/sdk-usage.html#virtualbox-adding-the-persistent-disk-to-the-old-sdk"
@@ -37,17 +38,17 @@ run:
     - "Use psdk to initialize the empty disk and to configure the SDK to use it:"
     - "~https://developer.apertis.org/latest/sdk-usage.html#preparing-the-persistent-disk-on-the-old-sdk"
     - "The SDK will reboot when the configuration is completed. After the reboot click on psdk icon again to confirm that the persistent disk is in use"
-    - "Run on a terminal(remember to replace v2020dev0):"
-    - $ ade sysroot update --release v2020dev0
+    - "Run on a terminal:"
+    - $ ade sysroot update --release <release version>
     - "Power off the virtual machine"
 
-    - "The following steps are for the SDK virtual machine named with new"
+    - "The following steps are for the SDK virtual machine named with new:"
     - "On VirtualBox add the same persistent disk used on previous steps to the SDK virtual machine:"
     - "~https://developer.apertis.org/latest/sdk-usage.html#virtualbox-adding-the-persistent-disk-to-the-new-sdk"
     - "Power on the virtual machine"
     - "Use psdk to configure the SDK to use the persistent disk:"
     - "~https://developer.apertis.org/latest/sdk-usage.html#using-the-persistent-disk-on-the-new-sdk"
     - "The SDK will reboot when the configuration is completed. After the reboot click on psdk icon again to confirm that the persistent disk is in use"
-    - "Run on a terminal(remember to replace v2020dev0):"
-    - $ ade sysroot update --release v2020dev0
+    - "Run on a terminal:"
+    - $ ade sysroot update --release <release version>
     - "Power off the virtual machine"
-- 
GitLab