Merge pull request #372 from dkropachev/dk/make-mapped-scylla-version-a-soft-requirement

dkropachev · web-flow · commit d768d74148a8 · 2024-08-20T06:42:19.000-04:00
Make MAPPED_SCYLLA_VERSION a soft requirement
diff --git a/ci/run_integration_test.sh b/ci/run_integration_test.sh
@@ -36,6 +36,5 @@ ccm remove
 
 # run test
 
-export MAPPED_SCYLLA_VERSION=3.11.4
 PROTOCOL_VERSION=4  pytest -rf --import-mode append $*
 
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,5 @@ ccm remove`
`36`	`36`
`37`	`37`	`# run test`
`38`	`38`
`39`		`-export MAPPED_SCYLLA_VERSION=3.11.4`
`40`	`39`	`PROTOCOL_VERSION=4 pytest -rf --import-mode append $*`
`41`	`40`