Skip to content

Updating test images for github pipeline execution #3678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 4 additions & 2 deletions .github/actions/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ runs:

# Mapping of redis version to stack version
declare -A redis_stack_version_mapping=(
["7.4.2"]="rs-7.4.0-v2"
["7.2.7"]="rs-7.2.0-v14"
["7.4.4"]="rs-7.4.0-v5"
["7.2.9"]="rs-7.2.0-v17"
)

if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
Expand All @@ -91,8 +91,10 @@ runs:
fi

invoke devenv --endpoints=all-stack

else
echo "Using redis CE for module tests"
export CLIENT_LIBS_TEST_STACK_IMAGE_TAG=$REDIS_VERSION
echo "REDIS_MOD_URL=redis://127.0.0.1:6379" >> $GITHUB_ENV
invoke devenv --endpoints all
fi
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hiredis-py-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
COVERAGE_CORE: sysmon
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
CURRENT_REDIS_VERSION: '7.4.2'
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.0.2'
CURRENT_REDIS_VERSION: '8.0.2'

jobs:
redis_version:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# this speeds up coverage with Python 3.12: https://github.com/nedbat/coveragepy/issues/1665
COVERAGE_CORE: sysmon
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: 'rs-7.4.0-v2'
CURRENT_REDIS_VERSION: '7.4.2'
CURRENT_CLIENT_LIBS_TEST_STACK_IMAGE_TAG: '8.0.2'
CURRENT_REDIS_VERSION: '8.0.2'

jobs:
dependency-audit:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
max-parallel: 15
fail-fast: false
matrix:
redis-version: ['8.0.1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.7']
redis-version: ['8.2-M01-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.4', '7.2.9']
python-version: ['3.9', '3.13']
parser-backend: ['plain']
event-loop: ['asyncio']
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
# image tag 8.0-RC2-pre is the one matching the 8.0 GA release
x-client-libs-stack-image: &client-libs-stack-image
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_STACK_IMAGE_TAG:-8.0-RC2-pre}"
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_STACK_IMAGE_TAG:-8.0.2}"

x-client-libs-image: &client-libs-image
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_IMAGE_TAG:-8.0-RC2-pre}"
image: "redislabs/client-libs-test:${CLIENT_LIBS_TEST_IMAGE_TAG:-8.0.2}"

services:

Expand Down
10 changes: 10 additions & 0 deletions tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -1088,13 +1088,23 @@ def test_lastsave(self, r):

@pytest.mark.onlynoncluster
@skip_if_server_version_lt("5.0.0")
@skip_if_server_version_gte("8.0.0")
def test_lolwut(self, r):
lolwut = r.lolwut().decode("utf-8")
assert "Redis ver." in lolwut

lolwut = r.lolwut(5, 6, 7, 8).decode("utf-8")
assert "Redis ver." in lolwut

@pytest.mark.onlynoncluster
@skip_if_server_version_lt("8.0.0")
def test_lolwut_v8_and_higher(self, r):
lolwut = r.lolwut().decode("utf-8")
assert lolwut

lolwut = r.lolwut(5, 6, 7, 8).decode("utf-8")
assert lolwut

@pytest.mark.onlynoncluster
@skip_if_server_version_lt("6.2.0")
@skip_if_redis_enterprise()
Expand Down
Loading