[ci] Enhancement: Platform Support Option

microsoft · Jun 19, 2024 · a0f80b8 · a0f80b8
1 parent 64536c1
commit a0f80b8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/catloop.yml b/.github/workflows/catloop.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \
@@ -103,6 +104,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \

diff --git a/.github/workflows/catmem.yml b/.github/workflows/catmem.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \
@@ -103,6 +104,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \

diff --git a/.github/workflows/catnap.yml b/.github/workflows/catnap.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \
@@ -103,6 +104,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \

diff --git a/.github/workflows/catnapw.yml b/.github/workflows/catnapw.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform windows \
           --server $SERVER \
           --client $CLIENT \
           --repository 'c:\demikernel' \
@@ -104,6 +105,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform windows \
           --server $SERVER \
           --client $CLIENT \
           --repository 'c:\demikernel' \

diff --git a/.github/workflows/catnip.yml b/.github/workflows/catnip.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \
@@ -103,6 +104,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \

diff --git a/.github/workflows/catpowder.yml b/.github/workflows/catpowder.yml
@@ -54,6 +54,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \
@@ -103,6 +104,7 @@ jobs:
           branch_name="${{ github.ref_name }}"
         fi
         python3 tools/demikernel_ci.py \
+          --platform linux \
           --server $SERVER \
           --client $CLIENT \
           --repository demikernel \

diff --git a/tools/demikernel_ci.py b/tools/demikernel_ci.py
@@ -17,6 +17,7 @@
 
 # Runs the CI pipeline.
 def run_pipeline(
+        platform: str,
         log_directory: str, repository: str, branch: str, libos: str, is_debug:
         bool, server: str, client: str, test_unit: bool, test_integration: bool,
         test_system: str, server_addr: str, client_addr: str, delay: float, config_path: str,
@@ -45,7 +46,7 @@ def run_pipeline(
         "enable_nfs": enable_nfs,
         "log_directory": log_directory,
         "is_sudo": is_sudo,
-        "platform": "linux" if libos != "catnapw" else "windows",
+        "platform": platform,
         "install_prefix": install_prefix,
     }
 
@@ -222,6 +223,7 @@ def read_args() -> argparse.Namespace:
         prog="demikernel_ci.py", description=description)
 
     # Host options.
+    parser.add_argument("--platform", required=True, help="set platform")
     parser.add_argument("--server", required=True, help="set server host name")
     parser.add_argument("--client", required=True, help="set client host name")
 
@@ -270,6 +272,7 @@ def main():
     args: argparse.Namespace = read_args()
 
     # Extract host options.
+    platform: str = args.platform
     server: str = args.server
     client: str = args.client
 
@@ -309,7 +312,9 @@ def main():
         move(log_directory, old_dir)
     mkdir(log_directory)
 
-    status: dict = run_pipeline(log_directory, repository, branch, libos, is_debug, server,
+    # TODO: check if (platform, libos) combination is valid.
+
+    status: dict = run_pipeline(platform, log_directory, repository, branch, libos, is_debug, server,
                                 client, test_unit, test_integration, test_system, server_addr,
                                 client_addr, delay, config_path, output_dir, enable_nfs, install_prefix)