Skip to content

Commit

Permalink
Make MAPPED_SCYLLA_VERSION a soft requirement
Browse files Browse the repository at this point in the history
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 ....
  • Loading branch information
dkropachev committed Aug 16, 2024
1 parent b1c9995 commit 78538d6
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions tests/integration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,26 @@ def _get_dse_version_from_cass(cass_version):
# Supported Clusters: Cassandra, DDAC, DSE, Scylla
DSE_VERSION = None
SCYLLA_VERSION = os.getenv('SCYLLA_VERSION', None)
SCYLLA_SOURCE = SCYLLA_VERSION
if os.getenv('DSE_VERSION', None): # we are testing against DSE
DSE_VERSION = Version(os.getenv('DSE_VERSION', None))
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)
if SCYLLA_VERSION.count("/"):
# SCYLLA_VERSION="unstable/master/....."
mcv_string = cv_string = os.getenv('MAPPED_SCYLLA_VERSION', None)
elif SCYLLA_VERSION.count(":"):
# SCYLLA_VERSION="release:6.0.2"
cv_string = SCYLLA_VERSION.split(":")[1]
mcv = os.getenv('MAPPED_SCYLLA_VERSION', cv_string)
else:
# SCYLLA_VERSION="6.0.2"
cv_string = SCYLLA_VERSION
mcv_string = os.getenv('MAPPED_SCYLLA_VERSION', cv_string)
SCYLLA_VERSION=f"release:{SCYLLA_VERSION}"
else:
cv_string = os.getenv('CASSANDRA_VERSION', None)
mcv_string = os.getenv('MAPPED_CASSANDRA_VERSION', None)
Expand Down

0 comments on commit 78538d6

Please sign in to comment.