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

gitlab_runner_tart_driver/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.7"
+__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,95 +174,79 @@ def prepare(
     ######################################################################
     # Create VM
     ######################################################################
-    max_retries = 3
-    retry_count = 0
-    while True:
-        try:
-            tart_vm_name = p.vm_name()
-            if tart_vm_name in tart_vm_map:
-                if tart_vm_map[tart_vm_name].running:
-                    click.echo(f"[INFO] Found running VM '{tart_vm_name}'. Going to stop it...")
-                    tart.stop(tart_vm_name)
-                click.echo(f"[INFO] Found VM '{tart_vm_name}'. Going to delete it...")
-                tart.delete(tart_vm_name)
-
-            # verfiy that the limit of running VMs is not exceeded
-            list_running_vms = []
-            for vm in tart.list():
-                if vm.running:
-                    list_running_vms.append(vm)
-
-            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",
-                )
-                sys.exit(system_failure_exit_code)
 
-            click.echo(f"[INFO] Cloning VM instance '{tart_vm_name}' from '{p.ci_job_image}'")
-            try:
-                tart.clone(p.ci_job_image, tart_vm_name)
-            except:
-                click.secho(f"[ERROR] failed to clone image f'{p.ci_job_image}'", fg="red")
-                sys.exit(system_failure_exit_code)
+    tart_vm_name = p.vm_name()
+    if tart_vm_name in tart_vm_map:
+        if tart_vm_map[tart_vm_name].running:
+            click.echo(f"[INFO] Found running VM '{tart_vm_name}'. Going to stop it...")
+            tart.stop(tart_vm_name)
+        click.echo(f"[INFO] Found VM '{tart_vm_name}'. Going to delete it...")
+        tart.delete(tart_vm_name)
+
+    # verfiy that the limit of running VMs is not exceeded
+    list_running_vms = []
+    for vm in tart.list():
+        if vm.running:
+            list_running_vms.append(vm)
+
+    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",
+        )
+        sys.exit(system_failure_exit_code)
 
-            if cpu or memory or p.display:
-                click.echo(f"[INFO] Configuring instance '{tart_vm_name}' from '{p.ci_job_image}'")
-                click.echo(
-                    f"[INFO] {tart_vm_name} [cpu={cpu if cpu else 'default'}, memory={memory if memory else 'default'}, display={p.display if p.display else 'default'}]"
-                )
-                tart.set(tart_vm_name, cpu=cpu, memory=memory, display=display)
-            elif auto_resources:
-                click.echo("[INFO] Auto resource-disribution enabled.")
-                host_spec = get_host_spec()
-                tart.set(
-                    tart_vm_name, cpu=int(host_spec.cpu_count / concurrency), memory=int(host_spec.memory / concurrency)
-                )
+    click.echo(f"[INFO] Cloning VM instance '{tart_vm_name}' from '{p.ci_job_image}'")
+    try:
+        tart.clone(p.ci_job_image, tart_vm_name)
+    except:
+        click.secho(f"[ERROR] failed to clone image f'{p.ci_job_image}'", fg="red")
+        sys.exit(system_failure_exit_code)
 
-            click.echo(f"[INFO] Starting VM instance '{tart_vm_name}'")
-
-            remote_build_dir = "/opt/builds"
-            remote_script_dir = "/opt/temp"
-            remote_cache_dir = "/opt/cache"
-
-            volume_mounts = []
-            if cache_dir:
-                cache_dir = os.path.abspath(os.path.expanduser(cache_dir))
-                os.makedirs(cache_dir, exist_ok=True)
-                click.echo(f"[INFO] Cache directory set to '{cache_dir}'")
-                volume_mounts.append(TartVolume(source=cache_dir, dest=remote_cache_dir, name="cache", ro=False))
-            if builds_dir:
-                # Concurrency compatible builds directory
-                # see https://docs.gitlab.com/runner/executors/shell.html#run-scripts-as-a-privileged-user
-                # <builds_dir>/<short-token>/<concurrent-id>/<namespace>/<project-name>.
-                builds_dir = os.path.join(
-                    os.path.abspath(os.path.expanduser(builds_dir)), p.ci_runner_short_token, p.ci_concurrent_project_id
-                )
-                os.makedirs(builds_dir, exist_ok=True)
-                click.echo(f"[INFO] Builds directory set to '{builds_dir}'")
-                volume_mounts.append(TartVolume(source=builds_dir, dest=remote_build_dir, name="builds", ro=False))
-
-            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,
-            )
-            _get_vm_ip(tart_client=tart, vm_name=tart_vm_name, params=p)
-            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)
+    if cpu or memory or p.display:
+        click.echo(f"[INFO] Configuring instance '{tart_vm_name}' from '{p.ci_job_image}'")
+        click.echo(
+            f"[INFO] {tart_vm_name} [cpu={cpu if cpu else 'default'}, memory={memory if memory else 'default'}, display={p.display if p.display else 'default'}]"
+        )
+        tart.set(tart_vm_name, cpu=cpu, memory=memory, display=display)
+    elif auto_resources:
+        click.echo("[INFO] Auto resource-disribution enabled.")
+        host_spec = get_host_spec()
+        tart.set(tart_vm_name, cpu=int(host_spec.cpu_count / concurrency), memory=int(host_spec.memory / concurrency))
+
+    click.echo(f"[INFO] Starting VM instance '{tart_vm_name}'")
+
+    remote_build_dir = "/opt/builds"
+    remote_script_dir = "/opt/temp"
+    remote_cache_dir = "/opt/cache"
+
+    volume_mounts = []
+    if cache_dir:
+        cache_dir = os.path.abspath(os.path.expanduser(cache_dir))
+        os.makedirs(cache_dir, exist_ok=True)
+        click.echo(f"[INFO] Cache directory set to '{cache_dir}'")
+        volume_mounts.append(TartVolume(source=cache_dir, dest=remote_cache_dir, name="cache", ro=False))
+    if builds_dir:
+        # Concurrency compatible builds directory
+        # see https://docs.gitlab.com/runner/executors/shell.html#run-scripts-as-a-privileged-user
+        # <builds_dir>/<short-token>/<concurrent-id>/<namespace>/<project-name>.
+        builds_dir = os.path.join(
+            os.path.abspath(os.path.expanduser(builds_dir)), p.ci_runner_short_token, p.ci_concurrent_project_id
+        )
+        os.makedirs(builds_dir, exist_ok=True)
+        click.echo(f"[INFO] Builds directory set to '{builds_dir}'")
+        volume_mounts.append(TartVolume(source=builds_dir, dest=remote_build_dir, name="builds", ro=False))
+
+    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,
+    )
+    _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

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.7.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.7
+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.7.dist-info → gitlab_runner_tart_driver-0.3.8.dist-info}/RECORD

@@ -1,20 +1,20 @@
-gitlab_runner_tart_driver/__init__.py,sha256=J0I0c7-a50EOnWXMryTu_E6xhXSYFBPjVpeYP_a3vRI,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=UQikIoLpZFWEM3BZQYb36S2x67ElkE4amCTBSqZIyKI,14700
-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.7.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
-gitlab_runner_tart_driver-0.3.7.dist-info/METADATA,sha256=a4QxViHAnAJHDhluxbeEz7XHt0gITfK1ostJNqjNIzM,20705
-gitlab_runner_tart_driver-0.3.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-gitlab_runner_tart_driver-0.3.7.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
-gitlab_runner_tart_driver-0.3.7.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
-gitlab_runner_tart_driver-0.3.7.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,,