Skip to content

Commit

Permalink
[ci] Bug Fix: System Tests on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
ppenna committed Jun 24, 2024
1 parent acbceb3 commit e7268f1
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 5 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
21 changes: 21 additions & 0 deletions tools/ci/config/test/windows/catnap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
catnap:
udp_ping_pong: {}
udp_push_pop: {}
tcp_close:
nclients: [32]
run_mode: [sequential, concurrent]
who_closes: [client, server]
tcp_wait:
nclients: [32]
scenario: [push_close_wait, push_async_close_wait,
push_async_close_pending_wait, pop_close_wait,
pop_async_close_wait,
pop_async_close_pending_wait]
tcp_ping_pong: {}
tcp_push_pop: {}
tcp_echo:
bufsize: [64, 1024]
nclients: [1, 32]
nrequests: [128, 1024]
run_mode: [sequential, concurrent]
nthreads: [1, 2, 4]
5 changes: 5 additions & 0 deletions tools/ci/config/test/windows/catpowder.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
catpowder:
udp_ping_pong: {}
udp_push_pop: {}
tcp_ping_pong: {}
tcp_push_pop: {}
4 changes: 2 additions & 2 deletions tools/ci/job/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ def __init__(self, config: dict):
super().__init__(config, f"system-test-{config['test_alias']}")

def execute(self) -> bool:
server_cmd: str = f"test-system-rust LIBOS={super().libos()} TEST={self.test_name} ARGS=\\'{self.server_args}\\'"
client_cmd: str = f"test-system-rust LIBOS={super().libos()} TEST={self.test_name} ARGS=\\'{self.client_args}\\'"
server_cmd: str = f"test-system-rust LIBOS={super().libos()} TEST={self.test_name} ARGS=\'{self.server_args}\'"
client_cmd: str = f"test-system-rust LIBOS={super().libos()} TEST={self.test_name} ARGS=\'{self.client_args}\'"
return super().execute(server_cmd, client_cmd)


Expand Down
6 changes: 3 additions & 3 deletions tools/demikernel_ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def run_pipeline(
# STEP 5: Run system tests.
if test_system and config["platform"]:
if status["checkout"] and status["compile"]:
ci_map = read_yaml(libos)
ci_map = read_yaml(platform, libos)
# Run pipe-open test.
if __should_run(ci_map[libos], "pipe_open", test_system):
scenario = ci_map[libos]['pipe_open']
Expand Down Expand Up @@ -203,8 +203,8 @@ def __should_run(ci_map, test_name: str, test_system: str) -> bool:
return test_name in ci_map and (test_system == "all" or test_system == test_name)


def read_yaml(libos: str):
path: str = f"tools/ci/config/test/{libos}.yaml"
def read_yaml(platform: str, libos: str):
path: str = f"tools/ci/config/test/{platform}/{libos}.yaml"
yaml_str = ""
with open(path) as f:
yaml_str = f.read()
Expand Down

0 comments on commit e7268f1

Please sign in to comment.