diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:04 +0300 |
commit | c3afdb42ddc7f24d51032ed0daef071a2dafdc93 (patch) | |
tree | 4bf3f4fed99d260370921dd2c222840012be14a3 /spec/fixtures | |
parent | 41aebff8ec728c167298aa44e037d8e324e00e8d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
16 files changed, 9 insertions, 144 deletions
diff --git a/spec/fixtures/config/redis_cache_config_with_env.yml b/spec/fixtures/config/redis_cache_config_with_env.yml deleted file mode 100644 index 52fd5a06460..00000000000 --- a/spec/fixtures/config/redis_cache_config_with_env.yml +++ /dev/null @@ -1,2 +0,0 @@ -test: - url: <%= ENV['TEST_GITLAB_REDIS_CACHE_URL'] %> diff --git a/spec/fixtures/config/redis_cache_new_format_host.yml b/spec/fixtures/config/redis_cache_new_format_host.yml deleted file mode 100644 index 02b9e7384ac..00000000000 --- a/spec/fixtures/config/redis_cache_new_format_host.yml +++ /dev/null @@ -1,29 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: - url: redis://:mynewpassword@localhost:6380/10 - sentinels: - - - host: localhost - port: 26380 # point to sentinel, not to redis port - - - host: replica2 - port: 26380 # point to sentinel, not to redis port -test: - url: redis://:mynewpassword@localhost:6380/10 - sentinels: - - - host: localhost - port: 26380 # point to sentinel, not to redis port - - - host: replica2 - port: 26380 # point to sentinel, not to redis port -production: - url: redis://:mynewpassword@localhost:6380/10 - sentinels: - - - host: replica1 - port: 26380 # point to sentinel, not to redis port - - - host: replica2 - port: 26380 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_cache_new_format_socket.yml b/spec/fixtures/config/redis_cache_new_format_socket.yml deleted file mode 100644 index 3634c550163..00000000000 --- a/spec/fixtures/config/redis_cache_new_format_socket.yml +++ /dev/null @@ -1,6 +0,0 @@ -development: - url: unix:/path/to/redis.cache.sock -test: - url: unix:/path/to/redis.cache.sock -production: - url: unix:/path/to/redis.cache.sock diff --git a/spec/fixtures/config/redis_cache_old_format_host.yml b/spec/fixtures/config/redis_cache_old_format_host.yml deleted file mode 100644 index 3609dcd022e..00000000000 --- a/spec/fixtures/config/redis_cache_old_format_host.yml +++ /dev/null @@ -1,5 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: redis://:mypassword@localhost:6380/10 -test: redis://:mypassword@localhost:6380/10 -production: redis://:mypassword@localhost:6380/10 diff --git a/spec/fixtures/config/redis_cache_old_format_socket.yml b/spec/fixtures/config/redis_cache_old_format_socket.yml deleted file mode 100644 index 26fa0eda245..00000000000 --- a/spec/fixtures/config/redis_cache_old_format_socket.yml +++ /dev/null @@ -1,3 +0,0 @@ -development: unix:/path/to/old/redis.cache.sock -test: unix:/path/to/old/redis.cache.sock -production: unix:/path/to/old/redis.cache.sock diff --git a/spec/fixtures/config/redis_new_format_host.yml b/spec/fixtures/config/redis_new_format_host.yml index dc8d74c63fa..3bd91bcee6b 100644 --- a/spec/fixtures/config/redis_new_format_host.yml +++ b/spec/fixtures/config/redis_new_format_host.yml @@ -1,29 +1,29 @@ # redis://[:password@]host[:port][/db-number][?option=value] # more details: http://www.iana.org/assignments/uri-schemes/prov/redis development: - url: redis://:mynewpassword@localhost:6379/99 + url: redis://:mynewpassword@development-host:6379/99 sentinels: - - host: localhost + host: development-replica1 port: 26379 # point to sentinel, not to redis port - - host: replica2 + host: development-replica2 port: 26379 # point to sentinel, not to redis port test: - url: redis://:mynewpassword@localhost:6379/99 + url: redis://:mynewpassword@test-host:6379/99 sentinels: - - host: localhost + host: test-replica1 port: 26379 # point to sentinel, not to redis port - - host: replica2 + host: test-replica2 port: 26379 # point to sentinel, not to redis port production: - url: redis://:mynewpassword@localhost:6379/99 + url: redis://:mynewpassword@production-host:6379/99 sentinels: - - host: replica1 + host: production-replica1 port: 26379 # point to sentinel, not to redis port - - host: replica2 + host: production-replica2 port: 26379 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_queues_config_with_env.yml b/spec/fixtures/config/redis_queues_config_with_env.yml deleted file mode 100644 index d16a9d8a7f8..00000000000 --- a/spec/fixtures/config/redis_queues_config_with_env.yml +++ /dev/null @@ -1,2 +0,0 @@ -test: - url: <%= ENV['TEST_GITLAB_REDIS_QUEUES_URL'] %> diff --git a/spec/fixtures/config/redis_queues_new_format_host.yml b/spec/fixtures/config/redis_queues_new_format_host.yml deleted file mode 100644 index bd0d82a5066..00000000000 --- a/spec/fixtures/config/redis_queues_new_format_host.yml +++ /dev/null @@ -1,29 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: - url: redis://:mynewpassword@localhost:6381/11 - sentinels: - - - host: localhost - port: 26381 # point to sentinel, not to redis port - - - host: replica2 - port: 26381 # point to sentinel, not to redis port -test: - url: redis://:mynewpassword@localhost:6381/11 - sentinels: - - - host: localhost - port: 26381 # point to sentinel, not to redis port - - - host: replica2 - port: 26381 # point to sentinel, not to redis port -production: - url: redis://:mynewpassword@localhost:6381/11 - sentinels: - - - host: replica1 - port: 26381 # point to sentinel, not to redis port - - - host: replica2 - port: 26381 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_queues_new_format_socket.yml b/spec/fixtures/config/redis_queues_new_format_socket.yml deleted file mode 100644 index b488d84d022..00000000000 --- a/spec/fixtures/config/redis_queues_new_format_socket.yml +++ /dev/null @@ -1,6 +0,0 @@ -development: - url: unix:/path/to/redis.queues.sock -test: - url: unix:/path/to/redis.queues.sock -production: - url: unix:/path/to/redis.queues.sock diff --git a/spec/fixtures/config/redis_queues_old_format_host.yml b/spec/fixtures/config/redis_queues_old_format_host.yml deleted file mode 100644 index 6531748a8d7..00000000000 --- a/spec/fixtures/config/redis_queues_old_format_host.yml +++ /dev/null @@ -1,5 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: redis://:mypassword@localhost:6381/11 -test: redis://:mypassword@localhost:6381/11 -production: redis://:mypassword@localhost:6381/11 diff --git a/spec/fixtures/config/redis_queues_old_format_socket.yml b/spec/fixtures/config/redis_queues_old_format_socket.yml deleted file mode 100644 index 53f5db72758..00000000000 --- a/spec/fixtures/config/redis_queues_old_format_socket.yml +++ /dev/null @@ -1,3 +0,0 @@ -development: unix:/path/to/old/redis.queues.sock -test: unix:/path/to/old/redis.queues.sock -production: unix:/path/to/old/redis.queues.sock diff --git a/spec/fixtures/config/redis_shared_state_config_with_env.yml b/spec/fixtures/config/redis_shared_state_config_with_env.yml deleted file mode 100644 index eab7203d0de..00000000000 --- a/spec/fixtures/config/redis_shared_state_config_with_env.yml +++ /dev/null @@ -1,2 +0,0 @@ -test: - url: <%= ENV['TEST_GITLAB_REDIS_SHARED_STATE_URL'] %> diff --git a/spec/fixtures/config/redis_shared_state_new_format_host.yml b/spec/fixtures/config/redis_shared_state_new_format_host.yml deleted file mode 100644 index 1c690567ae9..00000000000 --- a/spec/fixtures/config/redis_shared_state_new_format_host.yml +++ /dev/null @@ -1,29 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: - url: redis://:mynewpassword@localhost:6382/12 - sentinels: - - - host: localhost - port: 26382 # point to sentinel, not to redis port - - - host: replica2 - port: 26382 # point to sentinel, not to redis port -test: - url: redis://:mynewpassword@localhost:6382/12 - sentinels: - - - host: localhost - port: 26382 # point to sentinel, not to redis port - - - host: replica2 - port: 26382 # point to sentinel, not to redis port -production: - url: redis://:mynewpassword@localhost:6382/12 - sentinels: - - - host: replica1 - port: 26382 # point to sentinel, not to redis port - - - host: replica2 - port: 26382 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_shared_state_new_format_socket.yml b/spec/fixtures/config/redis_shared_state_new_format_socket.yml deleted file mode 100644 index 1b0e699729e..00000000000 --- a/spec/fixtures/config/redis_shared_state_new_format_socket.yml +++ /dev/null @@ -1,6 +0,0 @@ -development: - url: unix:/path/to/redis.shared_state.sock -test: - url: unix:/path/to/redis.shared_state.sock -production: - url: unix:/path/to/redis.shared_state.sock diff --git a/spec/fixtures/config/redis_shared_state_old_format_host.yml b/spec/fixtures/config/redis_shared_state_old_format_host.yml deleted file mode 100644 index fef5e768c5d..00000000000 --- a/spec/fixtures/config/redis_shared_state_old_format_host.yml +++ /dev/null @@ -1,5 +0,0 @@ -# redis://[:password@]host[:port][/db-number][?option=value] -# more details: http://www.iana.org/assignments/uri-schemes/prov/redis -development: redis://:mypassword@localhost:6382/12 -test: redis://:mypassword@localhost:6382/12 -production: redis://:mypassword@localhost:6382/12 diff --git a/spec/fixtures/config/redis_shared_state_old_format_socket.yml b/spec/fixtures/config/redis_shared_state_old_format_socket.yml deleted file mode 100644 index 4746afbb5ef..00000000000 --- a/spec/fixtures/config/redis_shared_state_old_format_socket.yml +++ /dev/null @@ -1,3 +0,0 @@ -development: unix:/path/to/old/redis.shared_state.sock -test: unix:/path/to/old/redis.shared_state.sock -production: unix:/path/to/old/redis.shared_state.sock |