Merge ~adam-collard/maas-ci/+git/system-tests:lxd-vm-bug into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Always start from scratch with VMs

Remove old-debug

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-vm-bug lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 5f69027dcb64c75850ff047122ad4f0df374f5cf

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-vm-bug lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 96e7fa963cb34e90a751a012553da080a62ac00e

review: Approve

[Diego Mascialino (dmascialino)]

review: Needs Information

7c3389a... by Adam Collard on 2022-07-04

Launch the VM with a fixed MAC address (diego's feedback)

[Diego Mascialino (dmascialino)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-vm-bug lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 7c3389aa4295f4c391b555f4efefa576c9687bb8

review: Approve

diff --git a/systemtests/env_builder/test_basic.py b/systemtests/env_builder/test_basic.py
index 20da521..43ac2cf 100644
--- a/systemtests/env_builder/test_basic.py
+++ b/systemtests/env_builder/test_basic.py
@@ -10,7 +10,6 @@ import pytest
 from retry import retry
 
 from systemtests.lxd import get_lxd
-from systemtests.subprocess import run_with_logging
 from systemtests.utils import (
     randomstring,
     retries,
@@ -120,9 +119,16 @@ class TestSetup:
         lxd = get_lxd(logger=testlog)
         instances = lxd.list_instances()
         vm_name = instance_config.name
-        # VM doesn't exist, let's create it
-        if vm_name not in instances:
-            lxd.create_vm(vm_name, profile=instance_config.lxd_profile)
+        # Force delete the VM so we know we're starting clean
+        if vm_name in instances:
+            lxd.delete(vm_name)
+
+        # Need to create a network device with a hwaddr
+        kwargs = {
+            "profile": instance_config.lxd_profile,
+            "volatile.eth0.hwaddr": instance_config.mac_address,
+        }
+        lxd.create_vm(vm_name, **kwargs)
 
         mac_address = instance_config.mac_address
 
@@ -143,11 +149,6 @@ class TestSetup:
                         lxd.start(vm_name)
                     except CalledProcessError:
                         lxd._run(["lxc", "info", "--show-log", vm_name])
-                        process = run_with_logging(["ps", "aux"], logger=testlog)
-                        for pid in process.stdout.splitlines():
-                            run_with_logging(
-                                ["cat", f"/proc/{pid}/cmdline"], logger=testlog
-                            )
                         raise
                 else:
                     assert (
@@ -169,10 +170,11 @@ class TestSetup:
         if machine["status_name"] == "New":
             maas_api_client.commission_machine(machine)
 
-            wait_for_machine(
+            machine = wait_for_machine(
                 maas_api_client,
                 machine,
                 status="Ready",
                 abort_status="Failed commissioning",
                 timeout=20 * 60,
             )
+        assert machine["status_name"] == "Ready"
diff --git a/systemtests/lxd.py b/systemtests/lxd.py
index 7fcdc78..b17ac0e 100644
--- a/systemtests/lxd.py
+++ b/systemtests/lxd.py
@@ -193,8 +193,8 @@ class CLILXD:
 
         return _retry_bad_handshake()
 
-    def delete(self, container: str) -> None:
-        self._run(["lxc", "delete", "--force", container])
+    def delete(self, instance: str) -> None:
+        self._run(["lxc", "delete", "--force", instance])
 
     def get_ip_address(self, container: str) -> str:
         @retry(
diff --git a/systemtests/tests_per_machine/test_hardware_sync.py b/systemtests/tests_per_machine/test_hardware_sync.py
index 6d71cf3..40d4346 100644
--- a/systemtests/tests_per_machine/test_hardware_sync.py
+++ b/systemtests/tests_per_machine/test_hardware_sync.py
@@ -111,7 +111,7 @@ def test_hardware_sync(
         enable_hw_sync="true",
     )
 
-    wait_for_machine(
+    hardware_sync_machine.machine = wait_for_machine(
         maas_api_client,
         hardware_sync_machine.machine,
         status="Deployed",
@@ -120,10 +120,6 @@ def test_hardware_sync(
         timeout=40 * 60,
     )
 
-    #    if machine_config.osystem == "ubuntu":
-    hardware_sync_machine.machine = maas_api_client.read_machine(
-        hardware_sync_machine.machine
-    )  # IP could change after deploy
     stdout = ssh_execute_command(
         hardware_sync_machine.machine, "ubuntu", ssh_key, "cat /etc/cloud/build.info"
     )
diff --git a/systemtests/tests_per_machine/test_machine.py b/systemtests/tests_per_machine/test_machine.py
index 2eacf19..049a176 100644
--- a/systemtests/tests_per_machine/test_machine.py
+++ b/systemtests/tests_per_machine/test_machine.py
@@ -92,7 +92,7 @@ def test_full_circle(
         machine, osystem=machine_config.osystem, distro_series=machine_config.osystem
     )
 
-    wait_for_machine(
+    machine = wait_for_machine(
         maas_api_client,
         machine,
         status="Deployed",
@@ -101,7 +101,6 @@ def test_full_circle(
     )
 
     if machine_config.osystem == "ubuntu":
-        machine = maas_api_client.read_machine(machine)  # IP could change after deploy
         stdout = ssh_execute_command(
             machine, "ubuntu", ssh_key, "cat /etc/cloud/build.info"
         )
diff --git a/systemtests/utils.py b/systemtests/utils.py
index bc389ce..ad4c33b 100644
--- a/systemtests/utils.py
+++ b/systemtests/utils.py
@@ -157,13 +157,13 @@ def wait_for_machine(
     abort_status: Optional[str] = None,
     timeout: float = 10 * 60,
     delay: float = 30,
-) -> None:
+) -> api.Machine:
     """Blocks execution until machine reaches given status."""
     for retry_info in retries(timeout, delay):
         tmp_machine = api_client.read_machine(machine)
         current_status = tmp_machine["status_name"]
         if current_status == status:
-            return
+            return tmp_machine
         else:
             # Deliberately overwrite this variable so the last one is kept
             events = debug_last_events(api_client, machine["system_id"])