Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sdcm/utils/version_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,11 @@ def get_specific_tag_of_docker_image(docker_repo: str):
branch = "master"
elif docker_repo == "scylladb/scylla-enterprise-nightly":
product = "scylla-enterprise"
branch = "enterprise"
# The `enterprise` rolling branch stopped producing builds when
# enterprise development folded into the unified releases, and its
# relocatables are gone from downloads.scylladb.com. `enterprise-2024.1`
# is the only branch still publishing scylla-enterprise-nightly images.
branch = "enterprise-2024.1"
else:
raise ValueError(f"SCT doesn't support getting latest from {docker_repo}")

Expand Down
19 changes: 11 additions & 8 deletions unit_tests/test_config_get_version_based_on_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from sdcm import sct_config
from sdcm.utils.common import get_latest_scylla_release
from sdcm.utils.version_utils import latest_unified_package

pytestmark = [
pytest.mark.integration,
Expand Down Expand Up @@ -155,14 +156,14 @@ def test_baremetal(monkeypatch):


def test_unified_package(monkeypatch):
# Unlike the sibling tests below, this one actually downloads and unpacks the
# package to read SCYLLA-VERSION-FILE, so the URL has to point at a package
# that still exists. Resolve the current master build instead of pinning one:
# unstable relocatables are garbage collected within a few months.
unified_package = latest_unified_package()

monkeypatch.setenv("SCT_CLUSTER_BACKEND", "gce")
monkeypatch.setenv(
"SCT_UNIFIED_PACKAGE",
(
"https://downloads.scylladb.com/unstable/scylla/master/relocatable/2023-11-13T03:04:27Z/"
"scylla-unified-5.5.0~dev-0.20231113.7b08886e8dd8.x86_64.tar.gz"
),
)
monkeypatch.setenv("SCT_UNIFIED_PACKAGE", unified_package)
monkeypatch.setenv(
"SCT_GCE_IMAGE_DB",
("https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/family/centos-7"),
Expand All @@ -176,7 +177,9 @@ def test_unified_package(monkeypatch):

_version, _is_enterprise = conf.get_version_based_on_conf()

assert "5.5.0" in _version
# e.g. scylla-unified-2026.4.0~dev-0.20260804.0cba3cd2a4b0.x86_64.tar.gz -> 2026.4.0
expected_version = unified_package.rsplit("/", 1)[-1].removeprefix("scylla-unified-").split("~")[0]
assert expected_version in _version
assert not _is_enterprise


Expand Down