Skip to content

Make MAPPED_SCYLLA_VERSION a soft requirement #372

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Make MAPPED_SCYLLA_VERSION a soft requirement #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ci/run_integration_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,5 @@ ccm remove

# run test

export MAPPED_SCYLLA_VERSION=3.11.4
PROTOCOL_VERSION=4 pytest -rf --import-mode append $*

4 changes: 2 additions & 2 deletions tests/integration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ def _get_dse_version_from_cass(cass_version):
DSE_CRED = os.getenv('DSE_CREDS', None)
CASSANDRA_VERSION = _get_cass_version_from_dse(DSE_VERSION.base_version)
CCM_VERSION = DSE_VERSION.base_version
else: # we are testing against Cassandra or DDAC
else: # we are testing against Cassandra,DDAC or Scylla
if SCYLLA_VERSION:
cv_string = SCYLLA_VERSION
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', None)
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', '3.11.4') # Assume that scylla matches cassandra `3.11.4` behavior
else:
cv_string = os.getenv('CASSANDRA_VERSION', None)
mcv_string = os.getenv('MAPPED_CASSANDRA_VERSION', None)
Expand Down