gitlab-runner-tart-driver 0.1.6__tar.gz → 0.1.7__tar.gz

{gitlab-runner-tart-driver-0.1.6/gitlab_runner_tart_driver.egg-info → gitlab-runner-tart-driver-0.1.7}/PKG-INFO

@@ -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.7/gitlab_runner_tart_driver/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.7"

{gitlab-runner-tart-driver-0.1.6 → gitlab-runner-tart-driver-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 → gitlab-runner-tart-driver-0.1.7/gitlab_runner_tart_driver.egg-info}/PKG-INFO

@@ -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 → gitlab-runner-tart-driver-0.1.7}/setup.py

@@ -10,7 +10,7 @@ this_directory = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
-version = "0.1.6"
+version = "0.1.7"
 
 version = f"{version}{os.environ.get('PIP_VERSION_POSTFIX','')}"
 

gitlab-runner-tart-driver-0.1.6/gitlab_runner_tart_driver/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.6"