Skip to content

Commit 91b73dd

Browse files
authored
Merge pull request #107 from dkropachev/dk/fix-scylla-driver-test-cli
Update 4.x scylla driver test cli
2 parents 4173818 + a6ccd69 commit 91b73dd

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

run.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,14 @@ def run(self) -> ProcessJUnit:
158158

159159
shutil.rmtree(self._report_path, ignore_errors=True)
160160
if self._scylla_version:
161-
cmd += f" -Dscylla.version={self._scylla_version} -Dccm.scylla"
161+
if self._tag.startswith('3') or self._driver_type != 'scylla':
162+
cmd += f" -Dscylla.version={self._scylla_version}"
163+
else:
164+
# Way it works after 4.19.0.0 `ccm.distribution` was introduced
165+
cmd += f" -Dccm.version={self._scylla_version} -Dccm.distribution=scylla"
166+
# Before 4.19.0.0 it required a flag:
167+
cmd += f" -Dccm.scylla"
168+
162169
elif self._scylla_install_dir:
163170
cmd += f" -Dccm.directory={self._scylla_install_dir}"
164171
else:

0 commit comments

Comments
 (0)