Skip to content

Commit 6e2a736

Browse files
committed
Make MAPPED_SCYLLA_VERSION a soft requirement
It is going to ease development and test process. From now on if you want to run it on release you can just run it as such: SCYLLA_VERSION="6.0.2" pytest ....
1 parent b1c9995 commit 6e2a736

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ci/run_integration_test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ ccm remove
3636

3737
# run test
3838

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

tests/integration/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ def _get_dse_version_from_cass(cass_version):
185185
DSE_CRED = os.getenv('DSE_CREDS', None)
186186
CASSANDRA_VERSION = _get_cass_version_from_dse(DSE_VERSION.base_version)
187187
CCM_VERSION = DSE_VERSION.base_version
188-
else: # we are testing against Cassandra or DDAC
188+
else: # we are testing against Cassandra,DDAC or Scylla
189189
if SCYLLA_VERSION:
190190
cv_string = SCYLLA_VERSION
191-
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', None)
191+
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', '3.11.4') # Assume that scylla matches cassandra `3.11.4` behavior
192192
else:
193193
cv_string = os.getenv('CASSANDRA_VERSION', None)
194194
mcv_string = os.getenv('MAPPED_CASSANDRA_VERSION', None)

0 commit comments

Comments
 (0)