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

gitlab_runner_tart_driver/__init__.py

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

gitlab_runner_tart_driver/commands/prepare.py

@@ -118,7 +118,10 @@ def prepare(
 
     # retrieve the SYSTEM_FAILURE_EXIT_CODE from the environment
     system_failure_exit_code = os.getenv("SYSTEM_FAILURE_EXIT_CODE", None)
-    if not system_failure_exit_code:
+    if system_failure_exit_code is not None:
+        # explicitly convert to int otherwise gitlab will not be able to react on it
+        system_failure_exit_code = int(system_failure_exit_code)
+    else:
         click.secho("[WARNING] SYSTEM_FAILURE_EXIT_CODE not set, defaulting to '1'", fg="red")
         system_failure_exit_code = 1
 
@@ -171,6 +174,7 @@ def prepare(
     ######################################################################
     # Create VM
     ######################################################################
+
     tart_vm_name = p.vm_name()
     if tart_vm_name in tart_vm_map:
         if tart_vm_map[tart_vm_name].running:
@@ -187,7 +191,8 @@ def prepare(
 
     if len(list_running_vms) > p.tart_max_vm_count:
         click.secho(
-            f"[ERROR] The limit of running VMs [{p.tart_max_vm_count}] is exceeded [{len(list_running_vms)}].", fg="red"
+            f"[ERROR] The limit of running VMs [{p.tart_max_vm_count}] is exceeded [{len(list_running_vms)}].",
+            fg="red",
         )
         sys.exit(system_failure_exit_code)
 
@@ -235,31 +240,13 @@ def prepare(
     for v in volumes:
         volume_mounts.append(TartVolume.from_string(v))
 
-    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)
+    _create_vm(
+        tart_client=tart,
+        vm_name=tart_vm_name,
+        volume_mounts=volume_mounts,
+        params=p,
+    )
+    _get_vm_ip(tart_client=tart, vm_name=tart_vm_name, params=p)
 
     ssh_session = _create_ssh_session(
         tart_client=tart, vm_name=tart_vm_name, params=p, system_failure_exit_code=system_failure_exit_code
@@ -305,15 +292,8 @@ def prepare(
     sys.exit(0)
 
 
-def _create_vm(
-    tart_client, vm_name, volume_mounts, params, system_failure_exit_code, max_retries=3, retry_timeout_in_sec=10
-):
+def _create_vm(tart_client, vm_name, volume_mounts, params, max_retries=3, retry_timeout_in_sec=10):
     # ensure that the VM is not running
-    try:
-        tart_client.delete(vm_name)
-    except Exception:
-        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
 
@@ -340,7 +320,7 @@ def _create_vm(
                 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):
+def _get_vm_ip(tart_client, vm_name, params, max_retries=3, retry_timeout_in_sec=10):
     retry_count = 0
     while True:
         try:

gitlab_runner_tart_driver/commands/run.py

@@ -34,13 +34,19 @@ def run(ssh_timeout, tart_executable, shell, script, stage):
 
     # retrieve the BUILD_FAILURE_EXIT_CODE from the environment
     build_failure_exit_code = os.getenv("BUILD_FAILURE_EXIT_CODE", None)
-    if not build_failure_exit_code:
+    if build_failure_exit_code is not None:
+        # explicitly convert to int otherwise gitlab will not be able to react on it
+        build_failure_exit_code = int(build_failure_exit_code)
+    else:
         click.secho("[WARNING] BUILD_FAILURE_EXIT_CODE not set, defaulting to '1'", fg="red")
         build_failure_exit_code = 1
 
     # retrieve the SYSTEM_FAILURE_EXIT_CODE from the environment
     system_failure_exit_code = os.getenv("SYSTEM_FAILURE_EXIT_CODE", None)
-    if not system_failure_exit_code:
+    if system_failure_exit_code is not None:
+        # explicitly convert to int otherwise gitlab will not be able to react on it
+        system_failure_exit_code = int(system_failure_exit_code)
+    else:
         click.secho("[WARNING] SYSTEM_FAILURE_EXIT_CODE not set, defaulting to '1'", fg="red")
         system_failure_exit_code = 1
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.6
+Version: 0.3.8
 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.6.dist-info → gitlab_runner_tart_driver-0.3.8.dist-info}/RECORD

@@ -1,20 +1,20 @@
-gitlab_runner_tart_driver/__init__.py,sha256=W_9dCm49nLvZulVAvvsafxLJjVBSKDBHz9K7szFZllo,22
+gitlab_runner_tart_driver/__init__.py,sha256=7dTW0A5-FkrEuNOotvR8oW59M2lvIwYouVqfJzvXpKk,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=hLybN4q-ppFeOs-DxJfv2Y4uVXJvTaJGNap_c7PZOeg,14488
-gitlab_runner_tart_driver/commands/run.py,sha256=kXQxi8nxv6QQRFzGrlqifLtFtbjXAYgjCiMVqXkb2_A,3065
+gitlab_runner_tart_driver/commands/prepare.py,sha256=lSUdKDsyrusumvs9Wk0aLWoYtgTcwt68p_87cMe_L84,13838
+gitlab_runner_tart_driver/commands/run.py,sha256=uGcCXbd1QQIsLh1uPlaQHARCIOye5VvGxZswNG95tVI,3399
 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
 gitlab_runner_tart_driver/modules/gitlab_custom_driver_config.py,sha256=ujxlzP1ZbfsZyLIsghID5c_jLPSt-1pDazE2B5CPORY,447
 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.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,,
+gitlab_runner_tart_driver-0.3.8.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
+gitlab_runner_tart_driver-0.3.8.dist-info/METADATA,sha256=UOo56l8ME30WqkuENFlY2AJ5XITkT1UdbYilDYC3wKA,20705
+gitlab_runner_tart_driver-0.3.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+gitlab_runner_tart_driver-0.3.8.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
+gitlab_runner_tart_driver-0.3.8.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
+gitlab_runner_tart_driver-0.3.8.dist-info/RECORD,,