Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Fuchsia CI script for package serving

Browse Source 
This updates the "start" and "stop" methods
of the test runner to use the standalone package
server.
This commit is contained in:
Clayton Wilkinson
2024-10-25 23:07:36 +00:00
parent b188577f14
commit d94a76a73f
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ci/docker/scripts/fuchsia-test-runner.py
+22 -30
View File
@@ -287,7 +287,7 @@ class TestEnvironment:
@property
def package_server_log_path(self) -> Path:
return self.tmp_dir().joinpath("package_server_log")
return self.tmp_dir().joinpath(f"repo_{self.TEST_REPO_NAME}.log")
@property
def emulator_log_path(self) -> Path:
@@ -401,6 +401,7 @@ class TestEnvironment:
# Set configs
configs = {
"log.enabled": "true",
"log.dir": self.tmp_dir(),
"test.is_isolated": "true",
"test.experimental_structured_output": "true",
}
@@ -575,43 +576,19 @@ class TestEnvironment:
stderr_handler=self.subprocess_logger.debug,
)
# Add repository
check_call_with_logging(
[
ffx_path,
"repository",
"add-from-pm",
"--repository",
self.TEST_REPO_NAME,
self.repo_dir(),
],
env=ffx_env,
stdout_handler=self.subprocess_logger.debug,
stderr_handler=self.subprocess_logger.debug,
)
# Start repository server
# Note that we must first enable the repository server daemon.
check_call_with_logging(
[
ffx_path,
"config",
"set",
"repository.server.enabled",
"true",
],
env=ffx_env,
stdout_handler=self.subprocess_logger.debug,
stderr_handler=self.subprocess_logger.debug,
)
check_call_with_logging(
[
ffx_path,
"repository",
"server",
"start",
"--background",
"--address",
"[::]:0",
"--repo-path",
self.repo_dir(),
"--repository",
self.TEST_REPO_NAME
],
env=ffx_env,
stdout_handler=self.subprocess_logger.debug,
@@ -1009,6 +986,21 @@ class TestEnvironment:
stderr_handler=self.subprocess_logger.debug,
)
# Stop the package server
self.env_logger.info("Stopping package server...")
check_call_with_logging(
[
self.tool_path("ffx"),
"repository",
"server",
"stop",
self.TEST_REPO_NAME
],
env=self.ffx_cmd_env(),
stdout_handler=self.subprocess_logger.debug,
stderr_handler=self.subprocess_logger.debug,
)
# Stop ffx isolation
self.env_logger.info("Stopping ffx isolation...")
self.stop_ffx_isolation()