Skip to content

Commit 5977e38

Browse files
authored
Dropping integration tests with Redis 6.2 from pipeline actions. (#3659)
1 parent dd87924 commit 5977e38

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ runs:
4646
CLIENT_LIBS_TEST_IMAGE_TAG: ${{ inputs.redis-version }}
4747
run: |
4848
set -e
49-
49+
5050
echo "::group::Installing dependencies"
5151
pip install -r dev_requirements.txt
5252
pip uninstall -y redis # uninstall Redis package installed via redis-entraid
@@ -57,80 +57,79 @@ runs:
5757
pip install -e ./hiredis-py
5858
else
5959
pip install "hiredis${{inputs.hiredis-version}}"
60-
fi
60+
fi
6161
echo "PARSER_BACKEND=$(echo "${{inputs.parser-backend}}_${{inputs.hiredis-version}}" | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_ENV
6262
else
6363
echo "PARSER_BACKEND=${{inputs.parser-backend}}" >> $GITHUB_ENV
6464
fi
6565
echo "::endgroup::"
66-
66+
6767
echo "::group::Starting Redis servers"
6868
redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
6969
echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
70-
70+
7171
if (( redis_major_version < 8 )); then
7272
echo "Using redis-stack for module tests"
73-
74-
# Mapping of redis version to stack version
73+
74+
# Mapping of redis version to stack version
7575
declare -A redis_stack_version_mapping=(
7676
["7.4.2"]="rs-7.4.0-v2"
7777
["7.2.7"]="rs-7.2.0-v14"
78-
["6.2.17"]="rs-6.2.6-v18"
7978
)
80-
79+
8180
if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
8281
export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=${redis_stack_version_mapping[$REDIS_VERSION]}
8382
echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
8483
else
8584
echo "Version not found in the mapping."
8685
exit 1
8786
fi
88-
87+
8988
if (( redis_major_version < 7 )); then
9089
export REDIS_STACK_EXTRA_ARGS="--tls-auth-clients optional --save ''"
91-
export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
90+
export REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"
9291
fi
93-
92+
9493
invoke devenv --endpoints=all-stack
9594
else
9695
echo "Using redis CE for module tests"
9796
echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
9897
invoke devenv --endpoints all
99-
fi
100-
98+
fi
99+
101100
sleep 10 # time to settle
102101
echo "::endgroup::"
103102
shell: bash
104103

105104
- name: Run tests
106105
run: |
107106
set -e
108-
107+
109108
run_tests() {
110109
local protocol=$1
111110
local eventloop=""
112-
111+
113112
if [ "${{inputs.event-loop}}" == "uvloop" ]; then
114113
eventloop="--uvloop"
115114
fi
116-
115+
117116
echo "::group::RESP${protocol} standalone tests"
118117
echo "REDIS_MOD_URL=${REDIS_MOD_URL}"
119-
118+
120119
if (( $REDIS_MAJOR_VERSION < 7 )) && [ "$protocol" == "3" ]; then
121120
echo "Skipping module tests: Modules doesn't support RESP3 for Redis versions < 7"
122121
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}" --extra-markers="not redismod and not cp_integration"
123-
else
122+
else
124123
invoke standalone-tests --redis-mod-url=${REDIS_MOD_URL} $eventloop --protocol="${protocol}"
125124
fi
126-
125+
127126
echo "::endgroup::"
128-
127+
129128
echo "::group::RESP${protocol} cluster tests"
130129
invoke cluster-tests $eventloop --protocol=${protocol}
131-
echo "::endgroup::"
130+
echo "::endgroup::"
132131
}
133-
132+
134133
run_tests 2 "${{inputs.event-loop}}"
135134
run_tests 3 "${{inputs.event-loop}}"
136135
shell: bash

.github/workflows/integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
max-parallel: 15
7575
fail-fast: false
7676
matrix:
77-
redis-version: ['8.0.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7', '6.2.17']
77+
redis-version: ['8.0.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7']
7878
python-version: ['3.9', '3.13']
7979
parser-backend: ['plain']
8080
event-loop: ['asyncio']

0 commit comments

Comments
 (0)