diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-02-14 19:02:09 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-02-14 19:02:09 +0300 |
| commit | cbe9c5ed295e720e14c6f04dfca74861eb2b416b (patch) | |
| tree | bd8ff41be3a019c8d2648e9aced289ca63f5faee /.gitlab-ci.yml | |
| parent | 7af55c315ecb87f3861ab526a7b1aed7877cda5e (diff) | |
| parent | 6e8b4bcbded47313f03753b8fea47596a73eb26a (diff) | |
Merge branch 'an-fix-gitaly-ruby-proxy-issues' into 'master'
Bring back a custom dialer for Gitaly Ruby
Closes gitlab-ce#53473 and #1447
See merge request gitlab-org/gitaly!1072
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c84e7445d..fee394b7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,12 @@ test:go1.10-git2.18-ruby-2.4: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 +test:proxy: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 + script: + - make test-with-proxies + race: <<: *go_test_definition script: |