gitlab-runner-tart-driver 0.3.9__tar.gz → 0.3.11__tar.gz

{gitlab-runner-tart-driver-0.3.9/gitlab_runner_tart_driver.egg-info → gitlab-runner-tart-driver-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.9
+Version: 0.3.11
 Home-page: https://gitlab.com/schmieder.matthias/gitlab-runner-tart-driver
 Author: Matthias Schmieder
 Author-email: schmieder.matthias@gmail.com
@@ -31,6 +31,7 @@ License-File: LICENSE.txt
     - [Auto Host Resource Distribution](#auto-host-resource-distribution)
     - [Custom `shell`](#custom-shell)
     - [Custom `pull_policy`](#custom-pull_policy)
+    - [Excluding Images with `--exclude-image-expr`](#excluding-images-with---exclude-image-expr)
   - [CLI](#cli)
     - [CLI Parameters for `config.toml`](#cli-parameters-for-configtoml)
     - [Command `config`](#command-config)
@@ -367,6 +368,21 @@ see **Command `run`**
 
 You can use a custom `pull_policy`. The default policy is `if-not-present`. Use `TART_PULL_POLICY` to override the default pull policy
 
+### Excluding Images with `--exclude-image-expr`
+
+You can use the `--exclude-image-expr` option with the `prepare` command to prevent certain images from being used. This option can be specified multiple times, each with a Python regular expression. If the image name matches any of the provided expressions, the command will exit with an error.
+
+**Example:**
+
+```bash
+gitlab-runner-tart-driver prepare --exclude-image-expr 'xcode:15.*' --exclude-image-expr 'ubuntu:.*-beta'
+```
+
+This will exclude any image matching `xcode:15.*` or `ubuntu:.*-beta`.
+
+- The matching uses Python's `re.search`, so even substrings can match the pattern.
+- Useful for preventing the use of unwanted or unsupported images in your CI pipeline.
+
 ## CLI
 
 ### CLI Parameters for `config.toml`
@@ -432,6 +448,8 @@ Options:
   --gitlab-runner-version TEXT    The version of the GitLab Runner to be
                                   installed. Example '15.11.0'
   -x, --tart-executable TEXT      Path to the tart executable.
+  --exclude-image-expr TEXT      Exclude images matching the given Python
+                                  regular expression.
   --help                          Show this message and exit.
 ```
 

{gitlab-runner-tart-driver-0.3.9 → gitlab-runner-tart-driver-0.3.11}/README.md

@@ -16,6 +16,7 @@
     - [Auto Host Resource Distribution](#auto-host-resource-distribution)
     - [Custom `shell`](#custom-shell)
     - [Custom `pull_policy`](#custom-pull_policy)
+    - [Excluding Images with `--exclude-image-expr`](#excluding-images-with---exclude-image-expr)
   - [CLI](#cli)
     - [CLI Parameters for `config.toml`](#cli-parameters-for-configtoml)
     - [Command `config`](#command-config)
@@ -352,6 +353,21 @@ see **Command `run`**
 
 You can use a custom `pull_policy`. The default policy is `if-not-present`. Use `TART_PULL_POLICY` to override the default pull policy
 
+### Excluding Images with `--exclude-image-expr`
+
+You can use the `--exclude-image-expr` option with the `prepare` command to prevent certain images from being used. This option can be specified multiple times, each with a Python regular expression. If the image name matches any of the provided expressions, the command will exit with an error.
+
+**Example:**
+
+```bash
+gitlab-runner-tart-driver prepare --exclude-image-expr 'xcode:15.*' --exclude-image-expr 'ubuntu:.*-beta'
+```
+
+This will exclude any image matching `xcode:15.*` or `ubuntu:.*-beta`.
+
+- The matching uses Python's `re.search`, so even substrings can match the pattern.
+- Useful for preventing the use of unwanted or unsupported images in your CI pipeline.
+
 ## CLI
 
 ### CLI Parameters for `config.toml`
@@ -417,6 +433,8 @@ Options:
   --gitlab-runner-version TEXT    The version of the GitLab Runner to be
                                   installed. Example '15.11.0'
   -x, --tart-executable TEXT      Path to the tart executable.
+  --exclude-image-expr TEXT      Exclude images matching the given Python
+                                  regular expression.
   --help                          Show this message and exit.
 ```
 

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

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

{gitlab-runner-tart-driver-0.3.9 → gitlab-runner-tart-driver-0.3.11}/gitlab_runner_tart_driver/commands/cleanup.py

@@ -24,8 +24,12 @@ def cleanup(tart_executable):
         except:
             click.secho(f"[ERROR] failed to stop '{tart_vm_name}'", fg="red")
 
-    # cleanup leftovers from previous runs
-    _remove_stopped_vms(tart, f"{p.vm_name_prefix}-.*")
+        # remove the VM
+        try:
+            click.echo(f"[INFO] deleting '{tart_vm_name}'")
+            tart.delete(tart_vm_name)
+        except:
+            click.secho(f"[ERROR] failed to delete '{tart_vm_name}'", fg="red")
 
 
 def _remove_stopped_vms(tart, pattern):

{gitlab-runner-tart-driver-0.3.9 → gitlab-runner-tart-driver-0.3.11}/gitlab_runner_tart_driver/commands/prepare.py

@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 import time
 
@@ -88,6 +89,16 @@ from gitlab_runner_tart_driver.modules.utils import print_host_spec
     help="The version of the GitLab Runner to be installed. Example '15.11.0'",
 )
 @click.option("-x", "--tart-executable", required=False, default="tart", type=str, help="Path to the tart executable.")
+@click.option(
+    "-e",
+    "--exclude-image-expr",
+    "exclude_image_exprs",
+    required=False,
+    default=[],
+    type=str,
+    multiple=True,
+    help="Exclude images matching these regex search expressions (can be used multiple times, e.g. --exclude-image-expr 'xcode:15.*')",
+)
 def prepare(
     cpu,
     memory,
@@ -102,9 +113,9 @@ def prepare(
     force_install_gitlab_runner,
     gitlab_runner_version,
     tart_executable,
+    exclude_image_exprs,
 ):
     """Prepare the environment and start the tart VM."""
-
     print_host_spec()
 
     p = GitLabCustomCommandConfig()
@@ -131,6 +142,16 @@ def prepare(
     for i in tart_images:
         tart_vm_map[i.name] = i
 
+    # Check if the image matches any exclude pattern
+    if exclude_image_exprs:
+        for expr in exclude_image_exprs:
+            if re.search(expr, p.ci_job_image):
+                click.secho(
+                    f"[ERROR] Image '{p.ci_job_image}' is excluded by pattern '{expr}' and not allowed for execution",
+                    fg="red",
+                )
+                sys.exit(system_failure_exit_code)
+
     ######################################################################
     # OCI LOGIN
     ######################################################################

{gitlab-runner-tart-driver-0.3.9 → gitlab-runner-tart-driver-0.3.11/gitlab_runner_tart_driver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-runner-tart-driver
-Version: 0.3.9
+Version: 0.3.11
 Home-page: https://gitlab.com/schmieder.matthias/gitlab-runner-tart-driver
 Author: Matthias Schmieder
 Author-email: schmieder.matthias@gmail.com
@@ -31,6 +31,7 @@ License-File: LICENSE.txt
     - [Auto Host Resource Distribution](#auto-host-resource-distribution)
     - [Custom `shell`](#custom-shell)
     - [Custom `pull_policy`](#custom-pull_policy)
+    - [Excluding Images with `--exclude-image-expr`](#excluding-images-with---exclude-image-expr)
   - [CLI](#cli)
     - [CLI Parameters for `config.toml`](#cli-parameters-for-configtoml)
     - [Command `config`](#command-config)
@@ -367,6 +368,21 @@ see **Command `run`**
 
 You can use a custom `pull_policy`. The default policy is `if-not-present`. Use `TART_PULL_POLICY` to override the default pull policy
 
+### Excluding Images with `--exclude-image-expr`
+
+You can use the `--exclude-image-expr` option with the `prepare` command to prevent certain images from being used. This option can be specified multiple times, each with a Python regular expression. If the image name matches any of the provided expressions, the command will exit with an error.
+
+**Example:**
+
+```bash
+gitlab-runner-tart-driver prepare --exclude-image-expr 'xcode:15.*' --exclude-image-expr 'ubuntu:.*-beta'
+```
+
+This will exclude any image matching `xcode:15.*` or `ubuntu:.*-beta`.
+
+- The matching uses Python's `re.search`, so even substrings can match the pattern.
+- Useful for preventing the use of unwanted or unsupported images in your CI pipeline.
+
 ## CLI
 
 ### CLI Parameters for `config.toml`
@@ -432,6 +448,8 @@ Options:
   --gitlab-runner-version TEXT    The version of the GitLab Runner to be
                                   installed. Example '15.11.0'
   -x, --tart-executable TEXT      Path to the tart executable.
+  --exclude-image-expr TEXT      Exclude images matching the given Python
+                                  regular expression.
   --help                          Show this message and exit.
 ```
 

{gitlab-runner-tart-driver-0.3.9 → gitlab-runner-tart-driver-0.3.11}/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.3.9"
+version = "0.3.11"
 
 version = f"{version}{os.environ.get('PIP_VERSION_POSTFIX', '')}"
 

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

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