diff options
| author | Michael Kozono <mkozono@gmail.com> | 2018-07-17 15:46:31 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2018-07-17 17:09:04 -0700 |
| commit | ceaef888ee76a46fcd7698391e44c5634d1cb6c2 (patch) | |
| tree | 9784c0f08c79257e0753c05e4253b036d4331412 | |
| parent | 632c395e1809715bd3c01e2733a2f8a357136a49 (diff) | |
| download | gitlab-ce-mk/run-specs-with-object-storage-enabled-for-uploads.tar.gz | |
| -rw-r--r-- | config/gitlab.yml.example | 16 | ||||
| -rw-r--r-- | spec/support/webmock.rb | 2 | ||||
| -rw-r--r-- | spec/unicorn/unicorn_spec.rb | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index ab109f5d04f..aabba14f91f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -745,14 +745,18 @@ test: aws_secret_access_key: AWS_SECRET_ACCESS_KEY region: us-east-1 uploads: - storage_path: tmp/tests/public object_store: - enabled: false + enabled: true + remote_directory: uploads + direct_upload: true # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) connection: - provider: AWS # Only AWS supported at the moment - aws_access_key_id: AWS_ACCESS_KEY_ID - aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: us-east-1 + provider: AWS + aws_access_key_id: minio + aws_secret_access_key: gdk-minio + aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + region: gdk + endpoint: 'https://60c5d141.ngrok.io' + path_style: true gitlab: host: localhost port: 80 diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb index af2906b7568..58354ce14f1 100644 --- a/spec/support/webmock.rb +++ b/spec/support/webmock.rb @@ -1,4 +1,4 @@ require 'webmock' require 'webmock/rspec' -WebMock.disable_net_connect!(allow_localhost: true) +WebMock.disable_net_connect!(allow_localhost: true, allow: %r{https://\w+.ngrok.io/}) diff --git a/spec/unicorn/unicorn_spec.rb b/spec/unicorn/unicorn_spec.rb index a4cf479a339..da241c83d5c 100644 --- a/spec/unicorn/unicorn_spec.rb +++ b/spec/unicorn/unicorn_spec.rb @@ -77,7 +77,7 @@ describe 'Unicorn' do end after(:all) do - WebMock.disable_net_connect!(allow_localhost: true) + WebMock.disable_net_connect!(allow_localhost: true, allow: %r{https://\w+.ngrok.io/}) Process.kill('TERM', @unicorn_master_pid) end |