Merge branch 'testing-hostOS-upgrade' into 'master'

Fix hostOS upgrade test

Fix a bug in the host-os-upgrade-test. It's working reliably now, so I removed the "allow-failure" on the job.

Note: this test is going to be deleted once we have VM tests on farm, so this is just a band-aid fix.

Also, we still need to get the test off of cargo, but we can do that after we merge the fix. 

See merge request dfinity-lab/public/ic!10450

Author: levsha

gitlab-ci/config/54--host-os-test--host-os-upgrade-test.yml

@@ -12,7 +12,6 @@
 host-os-upgrade-test:
   # This test runs VMs on the CI runner, which can be unreliable and slow. This
   # test is soon to be replaced with Farm tests: NODE-565
-  allow_failure: true
   extends:
     - .host-e2e-test-base
   needs:

ic-os/hostos/tests/ictools.py

@@ -10,7 +10,6 @@
 import cbor
 import gflags
 import requests
-import vmtools
 
 FLAGS = gflags.FLAGS
 
@@ -335,31 +334,13 @@ def wait_ssh_up(host, timeout=FLAGS.timeout):
     raise TimeoutError("Time out waiting for IC instance to come up.")
 
 
-def _get_artifact_version(artifact, kind):
-    if isinstance(artifact, vmtools.SystemImage):
-        artifact = artifact.local_path
+def get_upgrade_image_version(image):
+    command_line = f'tar xOzf "{image}" --occurrence=1 ./VERSION.TXT || tar xOzf "{image}" --occurrence=1 ./version.txt'
 
-    get_artifact_version = os.path.join(
-        os.path.dirname(os.path.abspath(__file__)),
-        "..",
-        "..",
-        "guestos",
-        "tests",
-        "scripts",
-        "get-artifact-version.sh",
-    )
-    process = subprocess.Popen([get_artifact_version, kind, artifact], stdout=subprocess.PIPE)
+    process = subprocess.Popen(command_line, shell=True, stdout=subprocess.PIPE)
     return process.stdout.read().decode("utf-8").strip()
 
 
-def get_disk_image_version(image):
-    return _get_artifact_version(image, "--disk")
-
-
-def get_upgrade_image_version(image):
-    return _get_artifact_version(image, "--upgrade")
-
-
 def build_ssh_extra_config():
     """
     Build extra config containing ssh keys.

ic-os/hostos/tests/vmtools.py

@@ -156,14 +156,17 @@ def get_name(self):
     def stop(self):
         """Stop the virtual machine."""
         if self.process:
-            self.process.terminate()
+            os.system(f"sudo kill -TERM {self.process.pid}")
+
             try:
-                self.process.poll(1)
+                self.process.wait(1)
                 self.process = None
                 return
             except Exception:
                 pass
-            self.process.kill()
+
+            os.system(f"sudo kill -KILL {self.process.pid}")
+
             self.process.wait()
             self.process = None
             return
@@ -198,6 +201,7 @@ def add_netdev(self, netdev, mac):
 
     def _build_base_cmdline(self):
         return [
+            "sudo",
             "qemu-system-x86_64",
             "-machine",
             "type=q35,accel=kvm",