Enable test-app with nv-gha-runner

- Updated `.github/copy-pr-bot.yaml` to initialize empty lists for additional trustees and vetters.
- Added support for `--add-host` argument in packaging commands and adjusted related classes to handle new parameters.
- Added support for `--rm` to remove the container after "run" exits
- Improved error handling and logging in container operations.
- Updated unit tests to cover new functionality related to host mappings.

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

.github/copy-pr-bot.yaml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 enabled: true
-additional_trustees:
-additional_vetters:
+additional_trustees: []
+additional_vetters: []
 auto_sync_draft: false
 auto_sync_ready: true

.github/workflows/main.yaml

@@ -24,9 +24,6 @@ name: Code Check
 
 on:
   push:
-    branches: ["main", "release/*"]
-  pull_request:
-    branches: ["main", "release/*"]
 
 jobs:
   pre-commit:
@@ -116,8 +113,12 @@ jobs:
           file: tests/reports/.coverage.lcov
 
   test-app:
-    if: false # disable until GPU supported nodes become available
-    runs-on: ${{ matrix.os }}
+    # runs-on: ${{ matrix.os }}
+    runs-on: linux-amd64-gpu-l4-latest-1
+    container:
+      image: nvidia/cuda:12.8.1-runtime-ubuntu22.04
+      env:
+        NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -126,6 +127,34 @@ jobs:
       PYTHON_VERSION: ${{ matrix.python-version }}
 
     steps:
+      - name: Install Git & JQ
+        run: |
+          apt-get update
+          apt-get install -y git jq
+          git --version
+          jq --version
+          echo $(pwd)
+          # Configure Git to handle the repository ownership
+          git config --global --add safe.directory $(pwd)
+
+      - name: Install Docker
+        run: |
+          # Add Docker's official GPG key:
+          apt-get update
+          apt-get install -y ca-certificates curl
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+          chmod a+r /etc/apt/keyrings/docker.asc
+
+          # Add the repository to Apt sources:
+          echo \
+            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+            $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+            tee /etc/apt/sources.list.d/docker.list > /dev/null
+          apt-get update
+          apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+          docker --version
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -142,39 +171,48 @@ jobs:
           poetry run pip install --upgrade pip setuptools
           poetry install --with test
 
+      - name: Locate Latest Artifacts
+        id: latest_artifact_path
+        run: |
+          echo "ARTIFACT_PATH=$(find releases -type f | sort | tail -n 1)" >> $GITHUB_OUTPUT
+          echo "CLI_VERSION=$(jq -r 'keys | sort_by(split(".") | map(tonumber)) | reverse | first' releases/3.0.0/artifacts.json)" >> $GITHUB_OUTPUT
+
       - name: Build and Install CLI
         run: |
           poetry build
           wheel=$(find dist/ -name holoscan_cli-*.whl)
           echo "Installing from ${wheel}"
           pip install ${wheel}
 
-      - name: Version Check
-        run: |
-          output=$(holoscan version | tail -1 | tr -s ' ' | cut -d' ' -f3)
-          expected=$(grep -m 1 version pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" | cut -d' ' -f3)
-          echo "Expected version: ${expected}"
-          echo "  Actual version: "$output""
-          test "$output" = "$expected"
-
       - name: Package Test App
+        env:
+          ARTIFACT_PATH: ${{ steps.latest_artifact_path.outputs.ARTIFACT_PATH }}
+          CLI_VERSION: ${{ steps.latest_artifact_path.outputs.CLI_VERSION }}
         run: |
-          holoscan package --source tests/app/artifacts.json \
+          holoscan package tests/app/python/ \
+                            -l DEBUG \
                             -c tests/app/python/app.yaml \
                             -t test-app-python \
-                            --platform x64-workstation \
-                            --sdk-version 0.0.0 \
-                            tests/app/python/
+                            --platform x86_64 \
+                            --uid 1000 \
+                            --gid 1000 \
+                            --source ${{ env.ARTIFACT_PATH }} \
+                            --sdk-version ${{ env.CLI_VERSION }} \
+                            --add-host developer.download.nvidia.com:23.46.17.44 \
+                            --add-host security.ubuntu.com:91.189.91.81 \
+                            --add-host archive.ubuntu.com:91.189.91.82 \
+                            --add-host pypi.org:151.101.128.223 \
+                            --add-host edge.urm.nvidia.com:23.46.228.176 \
+                            --add-host www.mellanox.com:23.46.228.176 \
+                            --add-host files.pythonhosted.org:151.101.0.223
 
       - name: Run Test App
-        env:
-          HOLOSCAN_SKIP_NVIDIA_CTK_CHECK: true
         run: |
           mkdir input
           mkdir output
-          touch input/file
-          touch output/file
-          holoscan run -r $(docker images | grep "test-app-python" | awk '{print $1":"$2}') -i input -o output
+          touch input/file1
+          touch output/file2
+          holoscan run --rm --uid 1000 --gid 1000 -r $(docker images | grep "test-app-python" | awk '{print $1":"$2}') -i input -o output
 
   testpypi-deploy:
     name: publish-test-pypi

src/holoscan_cli/common/argparse_types.py

@@ -15,7 +15,6 @@
 import argparse
 import os
 from pathlib import Path
-
 from .constants import SDK
 from .enum_types import Platform, PlatformConfiguration, SdkType
 
@@ -155,3 +154,18 @@ def valid_sdk_type(sdk_str: str) -> SdkType:
         raise argparse.ArgumentTypeError(f"{sdk_str} is not a valid option for --sdk.")
 
     return SdkType(sdk_str)
+
+
+def validate_host_ip(host_ip: str) -> str:
+    """Helper type checking and type converting method for ArgumentParser.add_argument
+    to convert check valid host:ip format.
+
+    Args:
+        host_ip: host ip string
+    """
+
+    host, ip = host_ip.split(":")
+    if host == "" or ip == "":
+        raise argparse.ArgumentTypeError(f"Invalid valid for --add-host: '{host_ip}'")
+
+    return host_ip

src/holoscan_cli/common/dockerutils.py

@@ -172,6 +172,7 @@ def docker_run(
     platform_config: str,
     shared_memory_size: str = "1GB",
     is_root: bool = False,
+    remove: bool = False,
 ):
     """Creates and runs a Docker container
 
@@ -351,6 +352,7 @@ def docker_run(
             ulimits,
             devices,
             group_adds,
+            remove,
         )
     else:
         _start_container(
@@ -368,6 +370,7 @@ def docker_run(
             ulimits,
             devices,
             group_adds,
+            remove,
         )
 
 
@@ -386,6 +389,7 @@ def _start_container(
     ulimits,
     devices,
     group_adds,
+    remove,
 ):
     container = docker.container.create(
         image_name,
@@ -394,7 +398,7 @@ def _start_container(
         hostname=name,
         name=name,
         networks=[network],
-        remove=True,
+        remove=False,
         shm_size=shared_memory_size,
         user=user,
         volumes=volumes,
@@ -441,7 +445,18 @@ def _start_container(
             except Exception:
                 print(str(log[1]))
 
-    logger.info(f"Container '{container_name}'({container_id}) exited.")
+    exit_code = container.state.exit_code
+    logger.info(
+        f"Container '{container_name}'({container_id}) exited with code {exit_code}."
+    )
+
+    if remove:
+        container.remove()
+
+    if exit_code != 0:
+        raise RuntimeError(
+            f"Container '{container_name}'({container_id}) exited with code {exit_code}."
+        )
 
 
 def _enter_terminal(
@@ -457,6 +472,7 @@ def _enter_terminal(
     ulimits,
     devices,
     group_adds,
+    remove,
 ):
     print("\n\nEntering terminal...")
     print(
@@ -475,7 +491,7 @@ def _enter_terminal(
         interactive=True,
         name=name,
         networks=[network],
-        remove=True,
+        remove=remove,
         shm_size=shared_memory_size,
         tty=True,
         user=user,

src/holoscan_cli/packager/arguments.py

@@ -76,6 +76,7 @@ def __init__(self, args: Namespace, temp_dir: str) -> None:
         self.build_parameters.cmake_args = args.cmake_args
         self.build_parameters.includes = args.includes
         self.build_parameters.additional_libs = args.additional_libs
+        self.build_parameters.add_hosts = args.add_hosts
 
         models = Models()
         platform = Platform(self._artifact_sources)

src/holoscan_cli/packager/container_builder.py

@@ -88,7 +88,6 @@ def _build_internal(
         Returns:
             PlatformBuildResults: build results
         """
-        self.print_build_info(platform_parameters)
         builder = create_and_get_builder(Constants.LOCAL_BUILDX_BUILDER_NAME)
 
         build_result = PlatformBuildResults(platform_parameters)
@@ -117,9 +116,15 @@ def _build_internal(
             "tags": [platform_parameters.tag],
         }
 
+        if self._build_parameters.add_hosts:
+            builds["add_hosts"] = {}
+            for host in self._build_parameters.add_hosts:
+                host_name, host_ip = host.split(":")
+                builds["add_hosts"][host_name] = host_ip
+
         export_to_tar_ball = False
         if self._build_parameters.tarball_output is not None:
-            build_result.tarball_filenaem = str(
+            build_result.tarball_filename = str(
                 self._build_parameters.tarball_output
                 / f"{platform_parameters.tag}{Constants.TARBALL_FILE_EXTENSION}"
             ).replace(":", "-")
@@ -134,7 +139,7 @@ def _build_internal(
                 builds["output"] = {
                     # type=oci cannot be loaded by docker: https://github.com/docker/buildx/issues/59
                     "type": "docker",
-                    "dest": build_result.tarball_filenaem,
+                    "dest": build_result.tarball_filename,
                 }
             else:
                 build_result.succeeded = False
@@ -155,21 +160,24 @@ def _build_internal(
             f"Building Holoscan Application Package: tag={platform_parameters.tag}"
         )
 
+        self.print_build_info(platform_parameters)
+
         try:
             build_docker_image(**builds)
             build_result.succeeded = True
             if export_to_tar_ball:
                 try:
                     self._logger.info(
-                        f"Saving {platform_parameters.tag} to {build_result.tarball_filenaem}..."
+                        f"Saving {platform_parameters.tag} to {build_result.tarball_filename}..."
                     )
                     docker_export_tarball(
-                        build_result.tarball_filenaem, platform_parameters.tag
+                        build_result.tarball_filename, platform_parameters.tag
                     )
                 except Exception as ex:
                     build_result.error = f"Error saving tarball: {ex}"
                     build_result.succeeded = False
-        except Exception:
+        except Exception as e:
+            print(e)
             build_result.succeeded = False
             build_result.error = (
                 "Error building image: see Docker output for additional details."
@@ -378,18 +386,27 @@ def _copy_pip_requirements(self):
         os.makedirs(pip_folder, exist_ok=True)
         pip_requirements_path = os.path.join(pip_folder, "requirements.txt")
 
+        # Build requirements content first
+        requirements_content = []
+        if self._build_parameters.requirements_file_path is not None:
+            with open(self._build_parameters.requirements_file_path) as lr:
+                requirements_content.extend(lr)
+            requirements_content.append("")
+
+        if self._build_parameters.pip_packages:
+            requirements_content.extend(self._build_parameters.pip_packages)
+
+        # Write all content at once
         with open(pip_requirements_path, "w") as requirements_file:
-            # Use local requirements.txt packages if provided, otherwise use sdk provided packages
-            if self._build_parameters.requirements_file_path is not None:
-                with open(self._build_parameters.requirements_file_path) as lr:
-                    for line in lr:
-                        requirements_file.write(line)
-                requirements_file.writelines("\n")
-
-            if self._build_parameters.pip_packages:
-                requirements_file.writelines(
-                    "\n".join(self._build_parameters.pip_packages)
-                )
+            requirements_file.writelines(requirements_content)
+            self._logger.debug(
+                "================ Begin requirements.txt ================"
+            )
+            for req in requirements_content:
+                self._logger.debug(f"  {req.strip()}")
+            self._logger.debug(
+                "================ End requirements.txt =================="
+            )
 
     def _copy_sdk_file(self, sdk_file: Optional[Path]):
         if sdk_file is not None and os.path.isfile(sdk_file):

src/holoscan_cli/packager/package_command.py

@@ -19,6 +19,7 @@
 from packaging.version import Version
 
 from ..common.argparse_types import (
+    validate_host_ip,
     valid_dir_path,
     valid_existing_dir_path,
     valid_existing_path,
@@ -84,6 +85,13 @@ def create_package_parser(
     )
 
     advanced_group = parser.add_argument_group(title="advanced build options")
+    advanced_group.add_argument(
+        "--add-host",
+        action="append",
+        dest="add_hosts",
+        type=validate_host_ip,
+        help="Add a custom host-to-IP mapping (format: host:ip).",
+    )
     advanced_group.add_argument(
         "--base-image",
         type=str,

src/holoscan_cli/packager/packager.py

@@ -103,7 +103,7 @@ def _package_application(args: Namespace):
                     f"""\nPlatform: {result.parameters.platform.value}/{result.parameters.platform_config.value}
     Status:     Succeeded
     Docker Tag: {result.docker_tag if result.docker_tag is not None else "N/A"}
-    Tarball:    {result.tarball_filenaem}"""  # noqa: E501
+    Tarball:    {result.tarball_filename}"""  # noqa: E501
                 )
             else:
                 print(