gitlab-runner-tart-driver 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

gitlab_runner_tart_driver/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

gitlab_runner_tart_driver/commands/cleanup.py

@@ -16,13 +16,17 @@ def cleanup(tart_executable):
     tart_vm_name = p.vm_name()
 
     # remove specific VM that we started
-    _remove_vm(tart, tart_vm_name)
+    try:
+        click.echo(f"[INFO] stopping '{tart_vm_name}'")
+        tart.stop(tart_vm_name)
+    except:
+        click.secho(f"[ERROR] failed to stop '{tart_vm_name}'", fg="red")
 
     # cleanup leftovers from previous runs
-    _remove_vm(tart, f"{p.vm_name_prefix}-.*", stopped_only=True)
+    _remove_stopped_vms(tart, f"{p.vm_name_prefix}-.*")
 
 
-def _remove_vm(tart, pattern, stopped_only=False):
+def _remove_stopped_vms(tart, pattern):
     tart_images = tart.list()
     tart_vm_map = dict()
     # create map from images
@@ -30,21 +34,10 @@ def _remove_vm(tart, pattern, stopped_only=False):
         tart_vm_map[i.name] = i
 
     for vm_name, vm in tart_vm_map.items():
-        m = re.match(pattern, vm_name)
-        if not m:
-            break
-
+        if vm.running or not re.match(pattern, vm_name):
+            continue
         try:
-            if not vm.running and stopped_only:
-                click.echo(f"[INFO] deleting '{vm_name}'")
-                tart.delete(vm.name)
-            elif vm.running and not stopped_only:
-                click.echo(f"[INFO] stopping '{vm_name}'")
-                tart.stop(vm.name)
-                click.echo(f"[INFO] deleting '{vm_name}'")
-                tart.delete(vm.name)
-            elif not vm.running:
-                click.echo(f"[INFO] deleting '{vm_name}'")
-                tart.delete(vm.name)
+            click.echo(f"[INFO] deleting '{vm_name}'")
+            tart.delete(vm.name)
         except:
             click.secho(f"[ERROR] failed to delete '{vm_name}'", fg="red")

{gitlab_runner_tart_driver-0.1.6.dist-info → gitlab_runner_tart_driver-0.1.7.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-gitlab_runner_tart_driver/__init__.py,sha256=n3oM6B_EMz93NsTI18NNZd-jKFcUPzUkbIKj5VFK5ok,22
+gitlab_runner_tart_driver/__init__.py,sha256=YpKDcdV7CqL8n45u267wKtyloM13FSVbOdrqgNZnSLM,22
 gitlab_runner_tart_driver/__main__.py,sha256=FiyMv64vDC-R8i3CGEP9QP48djZFHm7utyChwZJWCeY,107
 gitlab_runner_tart_driver/cli.py,sha256=1eFi9m8L4zcBO5eE4g4EP8phtE1znF54qt-xAigPsOE,596
 gitlab_runner_tart_driver/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gitlab_runner_tart_driver/commands/cleanup.py,sha256=3o2qijQ_okIHJKUWz_k40NhK2pIzkTLyFMKPJToBbVQ,1617
+gitlab_runner_tart_driver/commands/cleanup.py,sha256=So8Dut0Yi9lBRcU7_8u12ZEV-M5OSAqYgS0XewiiZ2I,1321
 gitlab_runner_tart_driver/commands/config.py,sha256=cacJ9ms5r3nZGZ_sS2d21Uoz7S-bMjB__lORUmeXZ-4,760
 gitlab_runner_tart_driver/commands/prepare.py,sha256=mx8n4vCfYXGW_ZwtY2PRdgcJPXBy2_BpoeZn9ct7Nqo,11270
 gitlab_runner_tart_driver/commands/run.py,sha256=n8x4FXQ9iO3TfCybUZM_u6HMs9rEDG-5lqAb_76-LcI,2654
@@ -12,9 +12,9 @@ gitlab_runner_tart_driver/modules/gitlab_custom_driver_config.py,sha256=PD7I45Ph
 gitlab_runner_tart_driver/modules/tart.py,sha256=gSo1NDwaAnulov8qijhn2TdXsaWI5Vqsuzxy-oakvjQ,8703
 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.1.6.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
-gitlab_runner_tart_driver-0.1.6.dist-info/METADATA,sha256=-UebsWklpOD3DHKEQ6P77nkCxC9VCzDke8YY6jpORX4,18585
-gitlab_runner_tart_driver-0.1.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-gitlab_runner_tart_driver-0.1.6.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
-gitlab_runner_tart_driver-0.1.6.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
-gitlab_runner_tart_driver-0.1.6.dist-info/RECORD,,
+gitlab_runner_tart_driver-0.1.7.dist-info/LICENSE.txt,sha256=TiYXQpEfbzcPBNGb7k1NslUngq_un-5cxGyT4W1S_f4,3303
+gitlab_runner_tart_driver-0.1.7.dist-info/METADATA,sha256=lci0gUzX3wc-ZMs_30GxahxBlQzA6IIT_uh7mmFEW8Y,18585
+gitlab_runner_tart_driver-0.1.7.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+gitlab_runner_tart_driver-0.1.7.dist-info/entry_points.txt,sha256=xmvpGQf1wvFPy5wqDWXu8k5FD_k9KkCNCkpuworTsr0,82
+gitlab_runner_tart_driver-0.1.7.dist-info/top_level.txt,sha256=JjRzCs2sr24xG4SV_5tIBPpNC1Tec7I4AbK4IKMDqOc,26
+gitlab_runner_tart_driver-0.1.7.dist-info/RECORD,,