gitlab-runner-tart-driver 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

gitlab_runner_tart_driver/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.5"
+__version__ = "0.3.6"

gitlab_runner_tart_driver/commands/prepare.py

@@ -235,14 +235,32 @@ def prepare(
     for v in volumes:
         volume_mounts.append(TartVolume.from_string(v))
 
-    _create_vm(
-        tart_client=tart,
-        vm_name=tart_vm_name,
-        volume_mounts=volume_mounts,
-        params=p,
-        system_failure_exit_code=system_failure_exit_code,
-    )
-    _get_vm_ip(tart_client=tart, vm_name=tart_vm_name, params=p, system_failure_exit_code=system_failure_exit_code)
+    max_retries = 3
+    retry_count = 0
+    while True:
+        try:
+            _create_vm(
+                tart_client=tart,
+                vm_name=tart_vm_name,
+                volume_mounts=volume_mounts,
+                params=p,
+                system_failure_exit_code=system_failure_exit_code,
+            )
+            _get_vm_ip(
+                tart_client=tart, vm_name=tart_vm_name, params=p, system_failure_exit_code=system_failure_exit_code
+            )
+            break
+        except Exception:
+            if retry_count < max_retries:
+                retry_count += 1
+                click.secho(
+                    "[WARNING] VM Coult not be started. Retrying...",
+                    fg="yellow",
+                )
+            else:
+                click.secho(f"[ERROR] VM '{tart_vm_name}' could not be started.")
+                sys.exit(system_failure_exit_code)
+
     ssh_session = _create_ssh_session(
         tart_client=tart, vm_name=tart_vm_name, params=p, system_failure_exit_code=system_failure_exit_code
     )
@@ -288,37 +306,41 @@ def prepare(
 
 
 def _create_vm(
-    tart_client, vm_name, volume_mounts, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=5
+    tart_client, vm_name, volume_mounts, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=10
 ):
+    # ensure that the VM is not running
     try:
-        tart_client.run(vm_name, volume_mounts, no_graphics=params.headless, softnet=params.softnet_enabled)
-        # check if vm is listed
-        retry_count = 0
-        while True:
-            try:
-                vm = tart_client.get(vm_name)
-                if vm:
-                    click.echo(f"[INFO] VM '{vm_name}' is running")
-                    break
-                else:
-                    raise Exception("VM not found")
-            except Exception:
-                if retry_count < max_retries:
-                    retry_count += 1
-                    click.secho(
-                        f"[WARNING] Failed to get IP of VM '{vm_name}'. [{retry_count+1}/{max_retries}] Retrying in '{retry_timeout_in_sec}' seconds...",
-                        fg="yellow",
-                    )
-                    time.sleep(retry_timeout_in_sec)
-                else:
-                    click.secho(f"[ERROR] VM '{vm_name}' could not be started.")
-                    sys.exit(system_failure_exit_code)
+        tart_client.delete(vm_name)
     except Exception:
-        click.secho(f"[ERROR] Failed to start VM '{vm_name}'", fg="red")
-        sys.exit(system_failure_exit_code)
+        pass
 
+    tart_client.run(vm_name, volume_mounts, no_graphics=params.headless, softnet=params.softnet_enabled)
+    time.sleep(10)  # give the VM some time to start
 
-def _get_vm_ip(tart_client, vm_name, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=5):
+    # check if vm is listed
+    retry_count = 0
+    while True:
+        try:
+            vm = tart_client.get(vm_name)
+            if vm:
+                click.echo(f"[INFO] VM '{vm_name}' is running")
+                break
+            else:
+                raise Exception("VM not found")
+        except Exception:
+            if retry_count < max_retries:
+                retry_count += 1
+                click.secho(
+                    f"[WARNING] VM with name '{vm_name}' was not found. Retrying in '{retry_timeout_in_sec}' seconds...",
+                    fg="yellow",
+                )
+                time.sleep(retry_timeout_in_sec)
+            else:
+                click.secho(f"[ERROR] VM '{vm_name}' could not be started.")
+                raise Exception("VM not found")
+
+
+def _get_vm_ip(tart_client, vm_name, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=10):
     retry_count = 0
     while True:
         try:
@@ -331,18 +353,18 @@ def _get_vm_ip(tart_client, vm_name, params, system_failure_exit_code, max_retri
             if retry_count < max_retries:
                 retry_count += 1
                 click.secho(
-                    f"[WARNING] VM with name '{vm_name}' was not found. Retrying in '{retry_timeout_in_sec}' seconds...",
+                    f"[WARNING] Failed to get IP of VM '{vm_name}'. [{retry_count+1}/{max_retries}] Retrying in '{retry_timeout_in_sec}' seconds...",
                     fg="yellow",
                 )
                 time.sleep(retry_timeout_in_sec)
             else:
                 click.secho(f"[ERROR] Failed to get IP of VM '{vm_name}'.")
-                sys.exit(system_failure_exit_code)
+                raise Exception("VM IP not found")
 
     return vm_ip_address
 
 
-def _create_ssh_session(tart_client, vm_name, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=5):
+def _create_ssh_session(tart_client, vm_name, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=10):
     ssh_session = None
     retry_count = 0
     while True:

{gitlab_runner_tart_driver-0.3.5.dist-info → gitlab_runner_tart_driver-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.5
+Version: 0.3.6
 Home-page: https://gitlab.com/schmieder.matthias/gitlab-runner-tart-driver
 Author: Matthias Schmieder
 Author-email: schmieder.matthias@gmail.com

{gitlab_runner_tart_driver-0.3.5.dist-info → gitlab_runner_tart_driver-0.3.6.dist-info}/RECORD

@@ -1,10 +1,10 @@
-gitlab_runner_tart_driver/__init__.py,sha256=ThnCuF3X7rsQSd5PAea_jfYA70ZmhLvkFcLBxBPwZnY,22
+gitlab_runner_tart_driver/__init__.py,sha256=W_9dCm49nLvZulVAvvsafxLJjVBSKDBHz9K7szFZllo,22
 gitlab_runner_tart_driver/__main__.py,sha256=FiyMv64vDC-R8i3CGEP9QP48djZFHm7utyChwZJWCeY,107
 gitlab_runner_tart_driver/cli.py,sha256=rCtFzi7i4JUX7VXteBHyII4sEbMzpn8SIpyjyKrQCBI,592
 gitlab_runner_tart_driver/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gitlab_runner_tart_driver/commands/cleanup.py,sha256=nFe7TGdxsVSXNR9onm-3iCjmUo6SzujV5LrA_y439fs,1422
 gitlab_runner_tart_driver/commands/config.py,sha256=cacJ9ms5r3nZGZ_sS2d21Uoz7S-bMjB__lORUmeXZ-4,760
-gitlab_runner_tart_driver/commands/prepare.py,sha256=JTxTlPnPELC9C2TMOLqvcu23jOL0sofMxdp9OwpfddU,13964
+gitlab_runner_tart_driver/commands/prepare.py,sha256=hLybN4q-ppFeOs-DxJfv2Y4uVXJvTaJGNap_c7PZOeg,14488
 gitlab_runner_tart_driver/commands/run.py,sha256=kXQxi8nxv6QQRFzGrlqifLtFtbjXAYgjCiMVqXkb2_A,3065
 gitlab_runner_tart_driver/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gitlab_runner_tart_driver/modules/gitlab_custom_command_config.py,sha256=XvE83QmQUcqtVMYZY3okGOgO86DBX6Y7xhXNenmKxFY,3086
@@ -12,9 +12,9 @@ gitlab_runner_tart_driver/modules/gitlab_custom_driver_config.py,sha256=ujxlzP1Z
 gitlab_runner_tart_driver/modules/tart.py,sha256=rD6IPtpz57dwsPGVBWaeKeVoqI1MoBvdtkqozXgmAxA,9914
 gitlab_runner_tart_driver/modules/utils.py,sha256=7ipKjy_5tC5iW67Na_A9XhF4o2lKcAqO8LRTTSJKNd0,923
 gitlab_runner_tart_driver/scripts/install-gitlab-runner.sh.j2,sha256=-rBzxZ92w7lMrTCVcjMHhlZgqPIK1RJKVoOc2wjZvck,2533
-gitlab_runner_tart_driver-0.3.5.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
-gitlab_runner_tart_driver-0.3.5.dist-info/METADATA,sha256=dI44fmUwC6k_iCygHAOKtp31CoAKM7uBme8-OPdYVo0,20705
-gitlab_runner_tart_driver-0.3.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-gitlab_runner_tart_driver-0.3.5.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
-gitlab_runner_tart_driver-0.3.5.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
-gitlab_runner_tart_driver-0.3.5.dist-info/RECORD,,
+gitlab_runner_tart_driver-0.3.6.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
+gitlab_runner_tart_driver-0.3.6.dist-info/METADATA,sha256=Dnxtm1KtThyxjTt3AJsm2QVnFE2jGQ8NLCJWo-9ns9c,20705
+gitlab_runner_tart_driver-0.3.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+gitlab_runner_tart_driver-0.3.6.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
+gitlab_runner_tart_driver-0.3.6.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
+gitlab_runner_tart_driver-0.3.6.dist-info/RECORD,,