python-gitlab · ptalbert · Dec 18, 2025 · Dec 15, 2025 · Dec 18, 2025 · Dec 18, 2025
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -153,18 +153,18 @@ To run these tests:
 
 When developing tests it can be a little frustrating to wait for GitLab to spin
 up every run. To prevent the containers from being cleaned up afterwards, pass
-``--keep-containers`` to pytest, i.e.:
+``--keep-containers-running`` to pytest, i.e.:
 
 .. code-block:: bash
 
-   tox -e api_func_v4 -- --keep-containers
+   tox -e api_func_v4 -- --keep-containers-running
 
 If you then wish to test against a clean slate, you may perform a manual clean
 up of the containers by running:
 
 .. code-block:: bash
 
-   docker-compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v
+   docker-compose -f gitlab/testing/docker/docker-compose.yml -p pytest-python-gitlab down -v
 
 By default, the tests run against the latest version of the ``gitlab/gitlab-ce``
 image. You can override both the image and tag by providing either the

diff --git a/gitlab/testing/__init__.py b/gitlab/testing/__init__.py
diff --git a/tests/functional/fixtures/.env → gitlab/testing/docker/.env b/tests/functional/fixtures/.env → gitlab/testing/docker/.env
diff --git a/gitlab/testing/docker/__init__.py b/gitlab/testing/docker/__init__.py
diff --git a/tests/functional/fixtures/create_license.rb → gitlab/testing/docker/create_license.rb b/tests/functional/fixtures/create_license.rb → gitlab/testing/docker/create_license.rb
diff --git a/tests/functional/fixtures/docker-compose.yml → gitlab/testing/docker/docker-compose.yml b/tests/functional/fixtures/docker-compose.yml → gitlab/testing/docker/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   gitlab:
-    image: '${GITLAB_IMAGE}:${GITLAB_TAG}'
+    image: '${GITLAB_IMAGE:-gitlab/gitlab-ee}:${GITLAB_TAG:-latest}'
     container_name: 'gitlab-test'
     hostname: 'gitlab.test'
     privileged: true # Just in case https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/1350
@@ -36,15 +36,15 @@ services:
       - -c
       - ruby /create_license.rb && /assets/wrapper
     volumes:
-      - ${PWD}/tests/functional/fixtures/create_license.rb:/create_license.rb
+      - ./create_license.rb:/create_license.rb
     ports:
       - '8080:80'
       - '2222:22'
     networks:
       - gitlab-network
 
   gitlab-runner:
-    image: '${GITLAB_RUNNER_IMAGE}:${GITLAB_RUNNER_TAG}'
+    image: '${GITLAB_RUNNER_IMAGE:-gitlab/gitlab-runner}:${GITLAB_RUNNER_TAG:-latest}'
     container_name: 'gitlab-runner-test'
     depends_on:
       - gitlab

diff --git a/tests/functional/fixtures/docker.py → gitlab/testing/docker/docker.py b/tests/functional/fixtures/docker.py → gitlab/testing/docker/docker.py
@@ -4,6 +4,7 @@
 """
 
 import pytest
+import pytest_docker
 
 
 @pytest.fixture(scope="session")
@@ -12,15 +13,27 @@
     return "pytest-python-gitlab"
 
 
+pytest_docker.docker_compose_project_name = docker_compose_project_name
+
+
 @pytest.fixture(scope="session")
-def docker_compose_file(fixture_dir):
-    return fixture_dir / "docker-compose.yml"
+def docker_compose_file(docker_assets_dir):
+    return docker_assets_dir / "docker-compose.yml"
+
+
+pytest_docker.docker_compose_file = docker_compose_file
 
 
 @pytest.fixture(scope="session")
 def docker_cleanup(request):
     """Conditionally keep containers around by overriding the cleanup command."""
-    if request.config.getoption("--keep-containers"):
+    if request.config.getoption("--keep-containers-running"):
         # Print version and exit.
         return "-v"
-    return "down -v"
+    if request.config.getoption("--keep-containers"):
+        # Stop the containers.
+        return "stop"
+    return "down"
+
+
+pytest_docker.docker_cleanup = docker_cleanup
diff --git a/gitlab/testing/docker/install_docker.sh b/gitlab/testing/docker/install_docker.sh
@@ -0,0 +1,11 @@
+apt-get update
+apt-get install -y apt-transport-https ca-certificates curl gnupg2 software-properties-common
+curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
+apt-get update
+echo \
+  "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  tee /etc/apt/sources.list.d/docker.list > /dev/null
+apt-get update
+apt-get install -y docker-ce docker-compose
+usermod -aG docker gitlab-runner
diff --git a/tests/functional/fixtures/set_token.rb → gitlab/testing/docker/set_token.rb b/tests/functional/fixtures/set_token.rb → gitlab/testing/docker/set_token.rb
diff --git a/gitlab/testing/fixtures/__init__.py b/gitlab/testing/fixtures/__init__.py