Skip to content

Commit c755cf9

Browse files
committed
Replacing redis-stack-server image usage with client-libs-test. Fixing lib version in setup.py
1 parent 9eddb16 commit c755cf9

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

.github/actions/run-tests/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
- name: Setup Test environment
3232
env:
3333
REDIS_VERSION: ${{ inputs.redis-version }}
34-
CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ inputs.redis-version }}"
34+
CLIENT_LIBS_TEST_IMAGE_TAG: ${{ inputs.redis-version }}
3535
run: |
3636
set -e
3737
@@ -55,13 +55,13 @@ runs:
5555
5656
# Mapping of redis version to stack version
5757
declare -A redis_stack_version_mapping=(
58-
["7.4.2"]="7.4.0-v2"
59-
["7.2.7"]="7.2.0-v14"
60-
["6.2.17"]="6.2.6-v18"
58+
["7.4.2"]="rs-7.4.0-v2"
59+
["7.2.7"]="rs-7.2.0-v14"
60+
["6.2.17"]="rs-6.2.6-v18"
6161
)
6262
6363
if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
64-
export REDIS_STACK_IMAGE="redis/redis-stack-server:${redis_stack_version_mapping[$REDIS_VERSION]}"
64+
export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=${redis_stack_version_mapping[$REDIS_VERSION]}
6565
echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
6666
else
6767
echo "Version not found in the mapping."

.github/workflows/integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2828
# this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
2929
COVERAGE_CORE: sysmon
30-
REDIS_STACK_IMAGE: redis/redis-stack-server:latest
30+
CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
3131
CURRENT_REDIS_VERSION: '7.4.2'
3232

3333
jobs:
@@ -180,7 +180,7 @@ jobs:
180180
- name: Run installed unit tests
181181
env:
182182
REDIS_VERSION: ${{ env.CURRENT_REDIS_VERSION }}
183-
CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ env.CURRENT_REDIS_VERSION }}"
183+
CLIENT_LIBS_TEST_IMAGE_TAG: ${{ env.CURRENT_REDIS_VERSION }}
184184
run: |
185185
bash .github/workflows/install_and_test.sh ${{ matrix.extension }}
186186

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ docker/stunnel/keys
2525
/dockers/cluster/
2626
/dockers/replica/
2727
/dockers/sentinel/
28+
/dockers/redis-stack/

docker-compose.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
---
2+
x-client-libs-stack-image: &client-libs-stack-image
3+
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_STACK_IMAGE_TAG:-rs-7.4.0-v2}"
4+
5+
x-client-libs-image: &client-libs-image
6+
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_IMAGE_TAG:-7.4.2}"
27

38
services:
49

510
redis:
6-
image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
11+
<<: *client-libs-image
712
container_name: redis-standalone
813
environment:
914
- TLS_ENABLED=yes
@@ -24,7 +29,7 @@ services:
2429
- all
2530

2631
replica:
27-
image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
32+
<<: *client-libs-image
2833
container_name: redis-replica
2934
depends_on:
3035
- redis
@@ -43,7 +48,7 @@ services:
4348
- all
4449

4550
cluster:
46-
image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
51+
<<: *client-libs-image
4752
container_name: redis-cluster
4853
environment:
4954
- REDIS_CLUSTER=yes
@@ -64,7 +69,7 @@ services:
6469
- all
6570

6671
sentinel:
67-
image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
72+
<<: *client-libs-image
6873
container_name: redis-sentinel
6974
depends_on:
7075
- redis
@@ -86,12 +91,16 @@ services:
8691
- all
8792

8893
redis-stack:
89-
image: ${REDIS_STACK_IMAGE:-redis/redis-stack-server:latest}
94+
<<: *client-libs-stack-image
9095
container_name: redis-stack
96+
environment:
97+
- REDIS_CLUSTER=no
98+
- PORT=6379
99+
command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --save ""}
91100
ports:
92101
- 6479:6379
93-
environment:
94-
- "REDIS_ARGS=${REDIS_STACK_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --save ''}"
102+
volumes:
103+
- "./dockers/redis-stack:/redis/work"
95104
profiles:
96105
- standalone
97106
- all-stack

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
long_description_content_type="text/markdown",
99
keywords=["Redis", "key-value store", "database"],
1010
license="MIT",
11-
version="5.3.0",
11+
version="5.2.1",
1212
packages=find_packages(
1313
include=[
1414
"redis",

0 commit comments

Comments
 (0)