Skip to content

Remove the dataset parameter from the prebuild logic #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borrrden merged 1 commit into from
Jun 9, 2025
Merged

Remove the dataset parameter from the prebuild logic #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions environment/aws/topology_setup/build_test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def main() -> None:
parser = ArgumentParser("Builds a given test server")
parser.add_argument("platform", type=str, help="The platform to build")
parser.add_argument("version", type=str, help="The version of CBL to use")
parser.add_argument("dataset_version", type=str, help="The dataset version to use")
parser.add_argument(
"--upload",
action="store_true",
Expand All @@ -86,7 +85,7 @@ def main() -> None:
)

args = parser.parse_args()
server = TestServer.create(args.platform, args.version, args.dataset_version)
server = TestServer.create(args.platform, args.version)
if "-" not in args.version:
raise ValueError(
f"Invalid version {args.version}, must be in the form x.y.z-build"
Expand Down
12 changes: 3 additions & 9 deletions environment/aws/topology_setup/setup_topology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,9 +642,7 @@ def resolve_test_servers(self):
"""
for test_server_input in self.__test_server_inputs:
test_server = TestServer.create(
test_server_input.platform,
test_server_input.cbl_version,
test_server_input.dataset_version,
test_server_input.platform, test_server_input.cbl_version
)
bridge = test_server.create_bridge()
bridge.validate(test_server_input.location)
Expand All @@ -663,9 +661,7 @@ def run_test_servers(self):
"""
for test_server_input in self.__test_server_inputs:
test_server = TestServer.create(
test_server_input.platform,
test_server_input.cbl_version,
test_server_input.dataset_version,
test_server_input.platform, test_server_input.cbl_version
)

if test_server_input.download:
Expand Down Expand Up @@ -702,9 +698,7 @@ def stop_test_servers(self):
TestServer.initialize()
for test_server_input in self.__test_server_inputs:
test_server = TestServer.create(
test_server_input.platform,
test_server_input.cbl_version,
test_server_input.dataset_version,
test_server_input.platform, test_server_input.cbl_version
)
bridge = test_server.create_bridge()
bridge.validate(test_server_input.location)
Expand Down
27 changes: 10 additions & 17 deletions environment/aws/topology_setup/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ class TestServer(ABC):

__registry: dict[str, type[TestServer]] = {}

def __init__(self, version: str, dataset_version: str) -> None:
def __init__(self, version: str) -> None:
self.__version = version
self.__dataset_version = dataset_version
self._downloaded = False

@classmethod
Expand Down Expand Up @@ -146,7 +145,7 @@ def decorator(subclass: type[TestServer]) -> type[TestServer]:
return decorator

@classmethod
def create(cls, name: str, version: str, dataset_version: str) -> TestServer:
def create(cls, name: str, version: str) -> TestServer:
"""
Create an instance of a registered test server subclass.

Expand All @@ -166,7 +165,7 @@ def create(cls, name: str, version: str, dataset_version: str) -> TestServer:
if name not in cls.__registry:
raise ValueError(f"Unknown test server type: {name}")

return cls.__registry[name](version, dataset_version)
return cls.__registry[name](version)

@property
def version(self) -> str:
Expand All @@ -178,16 +177,6 @@ def version(self) -> str:
"""
return self.__version

@property
def dataset_version(self) -> str:
"""
Get the dataset version of the test server.

Returns:
str: The dataset version of the test server.
"""
return self.__dataset_version

@property
@abstractmethod
def platform(self) -> str:
Expand Down Expand Up @@ -282,9 +271,13 @@ def create_bridge(self) -> PlatformBridge:
pass


def copy_dataset(dest_dir: Path, version: str):
header(f"Copying dataset resources v{version}")
db_dir = TEST_SERVER_DIR.parent / "dataset" / "server" / "dbs" / version
def copy_dataset(dest_dir: Path):
header("Copying dataset resources")
click.secho(
"WARNING: This call is deprecated, and the server should not need this anymore.",
fg="yellow",
)
db_dir = TEST_SERVER_DIR.parent / "dataset" / "server" / "dbs" / "3.2"
blob_dir = TEST_SERVER_DIR.parent / "dataset" / "server" / "blobs"

dest_db_dir = dest_dir / "dbs"
Expand Down
46 changes: 23 additions & 23 deletions environment/aws/topology_setup/test_server_platforms/c_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ class CTestServer(TestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@abstractmethod
def cbl_filename(self, version: str) -> str:
pass

def _copy_dataset(self) -> None:
copy_dataset(C_TEST_SERVER_DIR / "assets", self.dataset_version)
copy_dataset(C_TEST_SERVER_DIR / "assets")


class CTestServer_Desktop(CTestServer):
Expand Down Expand Up @@ -172,8 +172,8 @@ class CTestServer_iOS(CTestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down Expand Up @@ -264,7 +264,9 @@ def latestbuilds_path(self) -> str:
str: The path for the latest builds.
"""
version_parts = self.version.split("-")
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_ios_{self.dataset_version}.zip"
return (
f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_ios.zip"
)

def create_bridge(self) -> PlatformBridge:
"""
Expand Down Expand Up @@ -317,8 +319,8 @@ class CTestServer_Android(CTestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down Expand Up @@ -393,7 +395,7 @@ def latestbuilds_path(self) -> str:
str: The path for the latest builds.
"""
version_parts = self.version.split("-")
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_android_{self.dataset_version}.apk"
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_android.apk"

def create_bridge(self) -> PlatformBridge:
"""
Expand Down Expand Up @@ -439,9 +441,7 @@ def compress_package(self) -> str:
/ "release"
/ "app-release.apk"
)
zip_path = (
apk_path.parents[5] / f"testserver_android_{self.dataset_version}.apk"
)
zip_path = apk_path.parents[5] / "testserver_android.apk"
shutil.copy(apk_path, zip_path)
return str(zip_path)

Expand All @@ -466,8 +466,8 @@ class CTestServer_Windows(CTestServer_Desktop):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand All @@ -488,7 +488,7 @@ def latestbuilds_path(self) -> str:
str: The path for the latest builds.
"""
version_parts = self.version.split("-")
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_windows_{self.dataset_version}.zip"
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_windows.zip"

def cbl_filename(self, version: str) -> str:
return f"couchbase-lite-c-enterprise-{version}-windows-x86_64.zip"
Expand Down Expand Up @@ -527,8 +527,8 @@ class CTestServer_macOS(CTestServer_Desktop):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

def cbl_filename(self, version: str) -> str:
return f"couchbase-lite-c-enterprise-{version}-macos.zip"
Expand All @@ -552,7 +552,7 @@ def latestbuilds_path(self) -> str:
str: The path for the latest builds.
"""
version_parts = self.version.split("-")
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_macos_{self.dataset_version}.zip"
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_macos.zip"

def create_bridge(self) -> PlatformBridge:
"""
Expand Down Expand Up @@ -587,8 +587,8 @@ class CTestServer_Linux(CTestServer_Desktop):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str, arch: str):
super().__init__(version, dataset_version)
def __init__(self, version: str, arch: str):
super().__init__(version)
self.__arch = arch

@property
Expand All @@ -613,7 +613,7 @@ def latestbuilds_path(self) -> str:
str: The path for the latest builds.
"""
version_parts = self.version.split("-")
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_linux-{self.__arch}_{self.dataset_version}.tar.gz"
return f"couchbase-lite-c/{version_parts[0]}/{version_parts[1]}/testserver_linux-{self.__arch}.tar.gz"

def create_bridge(self) -> PlatformBridge:
"""
Expand Down Expand Up @@ -660,5 +660,5 @@ class CTestServer_Linux_x86_64(CTestServer_Linux):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version, "x86_64")
def __init__(self, version: str):
super().__init__(version, "x86_64")
24 changes: 12 additions & 12 deletions environment/aws/topology_setup/test_server_platforms/dotnet_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class DotnetTestServer(TestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
@abstractmethod
Expand Down Expand Up @@ -153,8 +153,8 @@ class DotnetTestServerCli(TestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
@abstractmethod
Expand Down Expand Up @@ -220,8 +220,8 @@ class DotnetTestServer_iOS(DotnetTestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down Expand Up @@ -337,8 +337,8 @@ class DotnetTestServer_Android(DotnetTestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down Expand Up @@ -448,8 +448,8 @@ class DotnetTestServer_Windows(DotnetTestServerCli):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down Expand Up @@ -546,8 +546,8 @@ class DotnetTestServer_macOS(DotnetTestServer):
version (str): The version of the test server.
"""

def __init__(self, version: str, dataset_version: str):
super().__init__(version, dataset_version)
def __init__(self, version: str):
super().__init__(version)

@property
def platform(self) -> str:
Expand Down
Loading
Loading