mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132163 - claywilkinson:master, r=tmandry

Browse Source 
Update Fuchsia CI script for package serving

This updates the "start" and "stop" methods
of the test runner to use the standalone package
server.

r? `@tmandry`
This commit is contained in:
Matthias Krüger 2024-10-26 06:29:47 +02:00 committed by GitHub
commit 42a0e40e46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/ci/docker/scripts/fuchsia-test-runner.py
View File

@ -287,7 +287,7 @@ class TestEnvironment:
@property @property
def package_server_log_path(self) -> Path: 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 @property
def emulator_log_path(self) -> Path: def emulator_log_path(self) -> Path:
@ -401,6 +401,7 @@ class TestEnvironment:
# Set configs # Set configs
configs = { configs = {
"log.enabled": "true", "log.enabled": "true",
"log.dir": self.tmp_dir(),
"test.is_isolated": "true", "test.is_isolated": "true",
"test.experimental_structured_output": "true", "test.experimental_structured_output": "true",
} }
@ -575,43 +576,19 @@ class TestEnvironment:
stderr_handler=self.subprocess_logger.debug, 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( check_call_with_logging(
[ [
ffx_path, ffx_path,
"repository", "repository",
"server", "server",
"start", "start",
"--background",
"--address", "--address",
"[::]:0", "[::]:0",
"--repo-path",
self.repo_dir(),
"--repository",
self.TEST_REPO_NAME
], ],
env=ffx_env, env=ffx_env,
stdout_handler=self.subprocess_logger.debug, stdout_handler=self.subprocess_logger.debug,
@ -1009,6 +986,21 @@ class TestEnvironment:
stderr_handler=self.subprocess_logger.debug, 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 # Stop ffx isolation
self.env_logger.info("Stopping ffx isolation...") self.env_logger.info("Stopping ffx isolation...")
self.stop_ffx_isolation() self.stop_ffx_isolation()