From af07718fff494cb6232387fbc29955d70abe2ec2 Mon Sep 17 00:00:00 2001 From: Nadav Har'El Date: Thu, 5 Mar 2026 00:45:03 +0200 Subject: [PATCH] test/cqlpy: fix "run --release" for versions 5.4 or older Recently we started to rely on the options "--auth-superuser-name" and "--auth-superuser-salted-password" to ensure that a cassandra/cassandra user exists for tests - without those options a default superuser no longer exists. This broke "test/cqlpy/run --release" for old releases, earlier than 5.4 (in the enterprise stream, 2024.1 or earlier), because those old release didn't have this option. So in this patch we fix the "--release" logic that removes these options from the command line when running these old versions. Signed-off-by: Nadav Har'El Closes scylladb/scylladb#28894 --- test/cqlpy/run.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/cqlpy/run.py b/test/cqlpy/run.py index e8139c71b3..2a249e1183 100755 --- a/test/cqlpy/run.py +++ b/test/cqlpy/run.py @@ -321,9 +321,9 @@ def run_scylla_cmd(pid, dir): # and other modules dependent on it: e.g. service levels '--authenticator', 'PasswordAuthenticator', '--authorizer', 'CassandraAuthorizer', - '--auth-superuser-name', 'cassandra', + '--auth-superuser-name=cassandra', # password is "cassandra" - '--auth-superuser-salted-password', '$6$x7IFjiX5VCpvNiFk$2IfjTvSyGL7zerpV.wbY7mJjaRCrJ/68dtT3UpT.sSmNYz1bPjtn3mH.kJKFvaZ2T4SbVeBijjmwGjcb83LlV/', + '--auth-superuser-salted-password=$6$x7IFjiX5VCpvNiFk$2IfjTvSyGL7zerpV.wbY7mJjaRCrJ/68dtT3UpT.sSmNYz1bPjtn3mH.kJKFvaZ2T4SbVeBijjmwGjcb83LlV/', '--strict-allow-filtering=true', '--strict-is-not-null-in-views=true', '--permissions-update-interval-in-ms', '100', @@ -385,6 +385,8 @@ def run_precompiled_scylla_cmd(exe, pid, dir): if major < [5,4] or (enterprise and major <= [2023,1]): cmd.remove('--strict-is-not-null-in-views=true') cmd.remove('--minimum-replication-factor-warn-threshold=-1') + cmd.remove('--auth-superuser-name=cassandra') + cmd.remove('--auth-superuser-salted-password=$6$x7IFjiX5VCpvNiFk$2IfjTvSyGL7zerpV.wbY7mJjaRCrJ/68dtT3UpT.sSmNYz1bPjtn3mH.kJKFvaZ2T4SbVeBijjmwGjcb83LlV/') if major <= [5,1] or (enterprise and major <= [2022,2]): cmd.remove('--query-tombstone-page-limit=1000') if major <= [5,0] or (enterprise and major <= [2022,1]):