Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,17 @@ jobs:
max-parallel: 8
matrix:
include:
- {redis: '7.2', ruby: '3.4'}
- {redis: '7.2', ruby: '3.4', compose: compose.ssl.yaml}
- {redis: '7.2', ruby: '3.4', driver: 'hiredis'}
- {redis: '7.2', ruby: '3.4', driver: 'hiredis', compose: compose.ssl.yaml}
- {redis: '7.2', ruby: '3.4', compose: compose.replica.yaml, replica: '2'}
- {redis: '8', ruby: '3.3', compose: compose.valkey.yaml, replica: '2'}
- {redis: '7.2', ruby: '3.2', compose: compose.auth.yaml}
- {redis: '7.0', ruby: '3.1'}
- {redis: '6.2', ruby: '3.0'}
- {redis: '5.0', ruby: '2.7'}
- {redis: '8', ruby: '3.4'}
- {redis: '8', ruby: '3.4', compose: compose.ssl.yaml}
- {redis: '8', ruby: '3.4', driver: 'hiredis'}
- {redis: '8', ruby: '3.4', driver: 'hiredis', compose: compose.ssl.yaml}
- {redis: '8', ruby: '3.4', compose: compose.auth.yaml}
- {redis: '8', ruby: '3.4', compose: compose.replica.yaml, replica: '2'}
- {redis: '8', ruby: '3.4', compose: compose.valkey.yaml, replica: '2'}
- {redis: '9', ruby: '3.4', compose: compose.valkey.yaml, replica: '2'}
- {redis: '7', ruby: '3.3'}
- {redis: '6', ruby: '3.2'}
- {redis: '5', ruby: '2.7'}
- {ruby: 'jruby'}
- {ruby: 'truffleruby'}
- {task: test_cluster_down}
Expand All @@ -54,7 +55,7 @@ jobs:
- {task: test_cluster_scale, pattern: 'Transaction', compose: compose.scale.yaml, startup: '8'}
- {task: test_cluster_scale, pattern: 'PubSub', compose: compose.scale.yaml, startup: '8'}
env:
REDIS_VERSION: ${{ matrix.redis || '7.2' }}
REDIS_VERSION: ${{ matrix.redis || '8' }}
DOCKER_COMPOSE_FILE: ${{ matrix.compose || 'compose.yaml' }}
REDIS_CONNECTION_DRIVER: ${{ matrix.driver || 'ruby' }}
REDIS_REPLICA_SIZE: ${{ matrix.replica || '1' }}
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
env:
REDIS_VERSION: '7.2'
REDIS_VERSION: '8'
DOCKER_COMPOSE_FILE: 'compose.nat.yaml'
steps:
- name: Check out code
Expand Down Expand Up @@ -139,7 +140,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
env:
REDIS_VERSION: '7.2'
REDIS_VERSION: '8'
DOCKER_COMPOSE_FILE: 'compose.latency.yaml'
REDIS_REPLICA_SIZE: '2'
REDIS_CLIENT_MAX_THREADS: '10'
Expand Down Expand Up @@ -181,7 +182,7 @@ jobs:
- original_mget
- emulated_mget
env:
REDIS_VERSION: '7.2'
REDIS_VERSION: '8'
DOCKER_COMPOSE_FILE: 'compose.yaml'
steps:
- name: Check out code
Expand Down Expand Up @@ -211,7 +212,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
env:
REDIS_VERSION: '7.2'
REDIS_VERSION: '8'
DOCKER_COMPOSE_FILE: 'compose.massive.yaml'
REDIS_SHARD_SIZE: '10'
REDIS_REPLICA_SIZE: '2'
Expand Down
4 changes: 2 additions & 2 deletions compose.auth.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -41,7 +41,7 @@ services:
ports:
- "6384:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.latency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 3 shards plus with each 2 replicas simutlated network delay
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -66,7 +66,7 @@ services:
ports:
- "6387:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.massive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/redis/redis/blob/unstable/redis.conf
services:
node001: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 32mb
Expand Down Expand Up @@ -166,7 +166,7 @@ services:
ports:
- "6408:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
2 changes: 1 addition & 1 deletion compose.nat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# DEBUG=1 bundle exec rake 'build_cluster[192.168.11.9,192.168.11.7]'
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down
4 changes: 2 additions & 2 deletions compose.replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 3 shards with double replicas
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -52,7 +52,7 @@ services:
ports:
- "6387:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.scale.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -47,7 +47,7 @@ services:
ports:
- "6386:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.ssl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# @see https://redis.io/docs/manual/security/encryption/
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -257,7 +257,7 @@ services:
ports:
- "6384:6384"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.valkey.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
node1: &node
image: "valkey/valkey:${REDIS_VERSION:-7}"
image: "valkey/valkey:${REDIS_VERSION:-9}"
command: >
valkey-server
--maxmemory 64mb
Expand Down Expand Up @@ -51,7 +51,7 @@ services:
ports:
- "6387:6379"
clustering:
image: "valkey/valkey:${REDIS_VERSION:-7}"
image: "valkey/valkey:${REDIS_VERSION:-9}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
node1: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 64mb
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
ports:
- "6384:6379"
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
4 changes: 2 additions & 2 deletions compose.yaml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/redis/redis/blob/unstable/redis.conf
services:
node001: &node
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
redis-server
--maxmemory 32mb
Expand Down Expand Up @@ -56,7 +56,7 @@ services:
- "<%= port + i - 1 %>:<%= port %>"
<% end %>
clustering:
image: "redis:${REDIS_VERSION:-7}"
image: "redis:${REDIS_VERSION:-8}"
command: >
bash -c "apt-get update > /dev/null
&& apt-get install --no-install-recommends --no-install-suggests -y dnsutils > /dev/null
Expand Down
Loading