diff options
| author | Vladimir Shushlin <v.shushlin@gmail.com> | 2021-05-24 17:11:11 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <v.shushlin@gmail.com> | 2021-05-25 10:13:57 +0300 |
| commit | 9a30f40a785ffe586a79a75ebebabda5f513b76f (patch) | |
| tree | 2367d1007692d53185b077a311e313336807145a /test/acceptance/helpers_test.go | |
| parent | 64a0f90dfbe5d255b1fb7df0aa481575037694a1 (diff) | |
Use API source by default
As part of https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5993
we want to change the default to API in %14.0
Users can still explicity set use_legacy_storage=true in omnibus which
will set domain-config-source=disk as temporary solution for any
problem they face with the new architecture
This commit also leaves disk as default for many acceptance tests
because these tests are not yet refactored to use API, see
https://gitlab.com/gitlab-org/gitlab-pages/-/issues/571
Changelog: changed
Diffstat (limited to 'test/acceptance/helpers_test.go')
| -rw-r--r-- | test/acceptance/helpers_test.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go index ba5790a3..7e26ee1c 100644 --- a/test/acceptance/helpers_test.go +++ b/test/acceptance/helpers_test.go @@ -373,6 +373,14 @@ 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: + // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/571 + // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382 + if !contains(extraArgs, "-domain-config-source") { + args = append(args, "-domain-config-source", "disk") + } + args = append(args, getPagesDaemonArgs(t)...) args = append(args, extraArgs...) |