Skip to content

Update Fuchsia CI script for package serving #132163

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
merged 2 commits into from
Oct 26, 2024
Merged

Update Fuchsia CI script for package serving #132163

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94a76a
Update Fuchsia CI script for package serving
claywilkinson Oct 25, 2024
ce4fc99
Fix indentation
tmandry Oct 25, 2024
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
52 changes: 22 additions & 30 deletions src/ci/docker/scripts/fuchsia-test-runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def setup_logging(self, log_to_file=False):

@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:
Expand Down Expand Up @@ -401,6 +401,7 @@ def start_ffx_isolation(self):
# Set configs
configs = {
"log.enabled": "true",
"log.dir": self.tmp_dir(),
"test.is_isolated": "true",
"test.experimental_structured_output": "true",
}
Expand Down Expand Up @@ -575,43 +576,19 @@ def start(self):
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,
Expand Down Expand Up @@ -1009,6 +986,21 @@ def stop(self):
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()
Expand Down
Loading