fix(testing): switch pytest-gitlab plugin to new runner registration API

ptalbert · ptalbert · commit 5e0756f0046d · 2025-12-18T15:04:43.000+01:00
Bring in the changes from cbc613d ('test(functional): switch to new runner registration API'). Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
diff --git a/gitlab/testing/fixtures/gitlab.py b/gitlab/testing/fixtures/gitlab.py
@@ -7,6 +7,7 @@
 import uuid
 from pathlib import Path
 from subprocess import check_output
+from typing import TYPE_CHECKING
 
 import pytest
 import requests
@@ -283,6 +284,7 @@ def gl(gitlab_url: str, gitlab_token: str) -> gitlab.Gitlab:
         retry_transient_errors=True,
         timeout=120,
     )
+    instance.auth()
 
     logging.info("Reset GitLab")
     reset_gitlab(instance)
@@ -291,39 +293,36 @@ def gl(gitlab_url: str, gitlab_token: str) -> gitlab.Gitlab:
 
 
 @pytest.fixture(scope="session")
-def gitlab_runner(gl):
+def gitlab_runner(gl: gitlab.Gitlab):
     container = "gitlab-runner-test"
-    runner_name = "python-gitlab-runner"
-    token = "registration-token"
+    runner_description = "python-gitlab-runner"
+    if TYPE_CHECKING:
+        assert gl.user is not None
+
+    runner = gl.user.runners.create(
+        {"runner_type": "instance_type", "run_untagged": True}
+    )
     url = "http://gitlab"
 
     docker_exec = ["docker", "exec", container, "gitlab-runner"]
     register = [
         "register",
-        "--run-untagged",
         "--non-interactive",
-        "--registration-token",
-        token,
-        "--name",
-        runner_name,
+        "--token",
+        runner.token,
+        "--description",
+        runner_description,
         "--url",
         url,
         "--clone-url",
         url,
         "--executor",
-        "docker",
-        "--docker-image",
-        "alpine:latest",
-        "--tag-list",
-        "docker",
-        "--docker-network-mode",
-        "gitlab-network",
+        "shell",
     ]
-    unregister = ["unregister", "--name", runner_name]
 
     yield check_output(docker_exec + register).decode()
 
-    check_output(docker_exec + unregister).decode()
+    gl.runners.delete(token=runner.token)
 
 
 @pytest.fixture(scope="module")
