From 5693c18637c2270c6d4f7d96554cff23e1f3ca2f Mon Sep 17 00:00:00 2001 From: Nadav Har'El Date: Mon, 10 Feb 2025 17:19:33 +0200 Subject: [PATCH] test/cqlpy, alternator: allow downloading 2025 releases This patch adds to the fetch_scylla.py script, used by the "--release" option of test/{cqlpy,alternator}/run, the ability to download the new 2025.1 releases. In the new single-stream releases, the number looks like the old Scylla Enterprise releases, but the location of the artifacts in the S3 bucket look like the old open-source releases (without the word "-enterprise" in the paths). So this patch introduces a new "if" for the (major >= 2025) case. Signed-off-by: Nadav Har'El Closes scylladb/scylladb#22778 --- test/cqlpy/fetch_scylla.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/cqlpy/fetch_scylla.py b/test/cqlpy/fetch_scylla.py index 87758fe559..475b9e1e19 100755 --- a/test/cqlpy/fetch_scylla.py +++ b/test/cqlpy/fetch_scylla.py @@ -66,7 +66,9 @@ def download_scylla(release, dir): major = f'{v[0]}.{v[1]}' bucket = f'downloads.scylladb.com' scylla_arch_string = '.' + scylla_arch + '.' - if int(v[0]) >= 2023: # Enterprise release (new organization) + if int(v[0]) >= 2025: # New single release stream (no separate Enterprise) + prefix = f'downloads/scylla/relocatable/scylladb-{major}/scylla-{release}' + elif int(v[0]) >= 2023: # Enterprise release (new organization) prefix = f'downloads/scylla-enterprise/relocatable/scylladb-{major}/scylla-enterprise-{release}' elif int(v[0]) > 2000: # Enterprise release (old organization) prefix = f'downloads/scylla-enterprise/relocatable/scylladb-{major}/scylla-enterprise-{scylla_arch}-package-{release}'