Skip to content

Commit 9c90863

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 9c90863

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
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: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,26 @@ def _get_dse_version_from_cass(cass_version):
180180
# Supported Clusters: Cassandra, DDAC, DSE, Scylla
181181
DSE_VERSION = None
182182
SCYLLA_VERSION = os.getenv('SCYLLA_VERSION', None)
183+
SCYLLA_SOURCE = SCYLLA_VERSION
183184
if os.getenv('DSE_VERSION', None): # we are testing against DSE
184185
DSE_VERSION = Version(os.getenv('DSE_VERSION', None))
185186
DSE_CRED = os.getenv('DSE_CREDS', None)
186187
CASSANDRA_VERSION = _get_cass_version_from_dse(DSE_VERSION.base_version)
187188
CCM_VERSION = DSE_VERSION.base_version
188-
else: # we are testing against Cassandra or DDAC
189+
else: # we are testing against Cassandra,DDAC or Scylla
189190
if SCYLLA_VERSION:
190-
cv_string = SCYLLA_VERSION
191-
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', None)
191+
if SCYLLA_VERSION.count("/"):
192+
# SCYLLA_VERSION="unstable/master/....."
193+
mcv_string = cv_string = os.getenv('MAPPED_SCYLLA_VERSION', None)
194+
elif SCYLLA_VERSION.count(":"):
195+
# SCYLLA_VERSION="release:6.0.2"
196+
cv_string = SCYLLA_VERSION.split(":")[1]
197+
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', cv_string)
198+
else:
199+
# SCYLLA_VERSION="6.0.2"
200+
cv_string = SCYLLA_VERSION
201+
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', cv_string)
202+
SCYLLA_VERSION=f"release:{SCYLLA_VERSION}"
192203
else:
193204
cv_string = os.getenv('CASSANDRA_VERSION', None)
194205
mcv_string = os.getenv('MAPPED_CASSANDRA_VERSION', None)

0 commit comments

Comments
 (0)