summaryrefslogtreecommitdiff
path: root/tools/functional/fixtures
diff options
context:
space:
mode:
authorNejc Habjan <nejc.habjan@siemens.com>2020-10-10 17:24:57 +0200
committerNejc Habjan <nejc.habjan@siemens.com>2020-10-12 18:29:06 +0200
commitf4e79501f1be1394873042dd65beda49e869afb8 (patch)
tree83dceff9d3571778a533978ac89d2a3f309fc73a /tools/functional/fixtures
parent375b29d3ab393f7b3fa734c5320736cdcba5df8a (diff)
downloadgitlab-fix/cli-binary-data.tar.gz
test(cli): add test for job artifacts downloadfix/cli-binary-data
Diffstat (limited to 'tools/functional/fixtures')
-rw-r--r--tools/functional/fixtures/docker-compose.yml17
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/functional/fixtures/docker-compose.yml b/tools/functional/fixtures/docker-compose.yml
index 687eeaa..a0794d6 100644
--- a/tools/functional/fixtures/docker-compose.yml
+++ b/tools/functional/fixtures/docker-compose.yml
@@ -1,4 +1,9 @@
version: '3'
+
+networks:
+ gitlab-network:
+ name: gitlab-network
+
services:
gitlab:
image: '${GITLAB_IMAGE}:${GITLAB_TAG}'
@@ -9,7 +14,7 @@ services:
GITLAB_OMNIBUS_CONFIG: |
external_url 'http://gitlab.test'
gitlab_rails['initial_root_password'] = '5iveL!fe'
- gitlab_rails['initial_shared_runners_registration_token'] = 'sTPNtWLEuSrHzoHP8oCU'
+ gitlab_rails['initial_shared_runners_registration_token'] = 'registration-token'
registry['enable'] = false
nginx['redirect_http_to_https'] = false
nginx['listen_port'] = 80
@@ -29,3 +34,13 @@ services:
ports:
- '8080:80'
- '2222:22'
+ networks:
+ - gitlab-network
+
+ gitlab-runner:
+ image: gitlab/gitlab-runner:latest
+ container_name: 'gitlab-runner-test'
+ depends_on:
+ - gitlab
+ networks:
+ - gitlab-network