diff options
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58a6ed3c3..55a740ccb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,14 +184,17 @@ tests-fedora-update-deps: services: - docker:stable-dind +.docker-variables-boilerplate: &docker-variables + DOCKER_HOST: tcp://docker:2375 + DOCKER_DRIVER: overlay2 + # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 + DOCKER_TLS_CERTDIR: "" + tests-remote-execution: <<: *tests <<: *remote-test variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_DRIVER: overlay2 - # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 - DOCKER_TLS_CERTDIR: "" + <<: *docker-variables COMPOSE_MANIFEST: .gitlab-ci/buildgrid-remote-execution.yml ARTIFACT_CACHE_SERVICE: http://docker:50052 REMOTE_EXECUTION_SERVICE: http://docker:50051 @@ -202,10 +205,7 @@ tests-remote-cache: <<: *tests <<: *remote-test variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_DRIVER: overlay2 - # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 - DOCKER_TLS_CERTDIR: "" + <<: *docker-variables COMPOSE_MANIFEST: .gitlab-ci/cache-server.yml ARTIFACT_CACHE_SERVICE: http://docker:50052 PYTEST_ARGS: "--color=yes --remote-cache" |