diff options
| author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-16 16:09:57 +0300 |
|---|---|---|
| committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-20 04:39:10 +0300 |
| commit | fc9f9694567273ec72e65db3673495a1b8d24050 (patch) | |
| tree | 4f491fd975fcd3bed53fc41bb8cb1e40d37327f6 /test/acceptance/helpers_test.go | |
| parent | 8a8074fac85119724b68af4456264e15750643c6 (diff) | |
test: remove domain-config-source=gitlab from test and remove tests using disk source
Diffstat (limited to 'test/acceptance/helpers_test.go')
| -rw-r--r-- | test/acceptance/helpers_test.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go index c1074230..c8852976 100644 --- a/test/acceptance/helpers_test.go +++ b/test/acceptance/helpers_test.go @@ -242,7 +242,6 @@ func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer { "-pages-root", wd, "-internal-gitlab-server", source.URL, "-api-secret-key", gitLabAPISecretKey, - "-domain-config-source", "gitlab", ) logBuf, cleanup := runPagesProcess(t, processCfg.wait, processCfg.pagesBinary, processCfg.listeners, "", processCfg.envs, processCfg.extraArgs...) @@ -352,16 +351,6 @@ func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraAr args = append(args, "-metrics-address", promPort) } - // most of our acceptance tests still work only with disk source - // TODO: remove this with -domain-config-source flag itself along with daemon-enable-jail: - // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382 - // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561 - if !contains(extraArgs, "-domain-config-source") { - args = append(args, - "-domain-config-source", "disk", - ) - } - args = append(args, getPagesDaemonArgs(t)...) args = append(args, extraArgs...) |