fix sanity and security tests

Author: sirutBuasai

sglang/x86_64/gpu/Dockerfile

@@ -94,6 +94,8 @@ RUN dpkg -l | grep -E "cuda|nvidia|libnv" | awk '{print $2}' | xargs apt-mark ho
  && apt-get upgrade -y \
  && apt-get clean
 
+RUN rm -rf /tmp/*
+
 COPY sagemaker_entrypoint.sh /usr/local/bin/sagemaker_entrypoint.sh
 RUN chmod +x /usr/local/bin/sagemaker_entrypoint.sh
 

test/dlc_tests/sanity/test_anaconda.py

@@ -15,7 +15,7 @@ def test_repo_anaconda_not_present(image):
 
         # First check to see if image has conda installed, if not, skip test since no packages installed from conda present
         conda_present = test_utils.run_cmd_on_container(
-            container_name, ctx, 'find . -name conda -not -path "**/.github/*" -ignore_readdir_race'
+            container_name, ctx, 'find . -name conda -not -path "**/.github/*" -not -path "**/.oh-my-zsh/*" -ignore_readdir_race'
         ).stdout.strip()
         if not conda_present:
             pytest.skip(f"Image {image} does not have conda installed, skipping test.")

test/dlc_tests/sanity/test_boottime_container_security.py

@@ -1,15 +1,15 @@
 import pytest
-
 from invoke import run
 
 
 @pytest.mark.usefixtures("sagemaker", "security_sanity")
 @pytest.mark.model("N/A")
 @pytest.mark.canary("Run security test regularly on production images")
 def test_security(image):
-    if "vllm" in image:
+    upstream_types = ["vllm"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vLLM images do not require pip check as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require boot time security check as they are managed by upstream devs. Skipping test."
         )
     repo_name, image_tag = image.split("/")[-1].split(":")
     container_name = f"{repo_name}-{image_tag}-security"

test/dlc_tests/sanity/test_dlc_labels.py

@@ -31,10 +31,12 @@ def test_dlc_major_version_label(image, region):
 @pytest.mark.integration("dlc_labels")
 @pytest.mark.model("N/A")
 def test_dlc_standard_labels(image, region):
-    if "vllm" in image:
+    upstream_types = ["vllm", "sglang"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vLLM images do not require test_dlc_standard_labels check as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require test_dlc_standard_labels check as they are managed by upstream devs. Skipping test."
         )
+
     customer_type_label_prefix = "ec2" if test_utils.is_ec2_image(image) else "sagemaker"
 
     framework, fw_version = test_utils.get_framework_and_version_from_tag(image)

test/dlc_tests/sanity/test_ecr_scan.py

@@ -435,10 +435,12 @@ def test_ecr_enhanced_scan(image, ecr_client, sts_client, region):
     :param sts_client: boto3 Client for STS
     :param region: str Name of region where test is executed
     """
-    if "vllm" in image:
+    upstream_types = ["vllm", "sglang"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vLLM images do not require test_ecr_enhanced_scan check as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require test_ecr_enhanced_scan check as they are managed by upstream devs. Skipping test."
         )
+
     LOGGER.info(f"Running test_ecr_enhanced_scan for image {image}")
     image = conduct_preprocessing_of_images_before_running_ecr_scans(
         image, ecr_client, sts_client, region

test/dlc_tests/sanity/test_pre_release.py

@@ -1,58 +1,55 @@
+import filecmp
+import json
 import os
 import re
 import subprocess
-import botocore
-import boto3
-import json
 import time
-
-from packaging.version import Version
-from packaging.specifiers import SpecifierSet
-
-import pytest
-import requests
-import filecmp
-
-from urllib3.util.retry import Retry
-from invoke.context import Context
-from botocore.exceptions import ClientError
-
-from src.buildspec import Buildspec
-import src.utils as src_utils
 from test.test_utils import (
-    LOGGER,
+    AL2023_BASE_DLAMI_ARM64_US_WEST_2,
     CONTAINER_TESTS_PREFIX,
+    LOGGER,
+    DockerImagePullException,
     ec2,
+    execute_env_variables_test,
+    get_account_id_from_image_uri,
+    get_all_the_tags_of_an_image_from_ecr,
+    get_buildspec_path,
     get_container_name,
+    get_cuda_version_from_tag,
     get_framework_and_version_from_tag,
-    get_neuron_sdk_version_from_tag,
+    get_image_spec_from_buildspec,
+    get_installed_python_packages_using_image_uri,
+    get_installed_python_packages_with_version,
+    get_labels_from_ecr_image,
     get_neuron_release_manifest,
+    get_neuron_sdk_version_from_tag,
+    get_python_version_from_image_uri,
+    get_pytorch_version_from_autogluon_image,
+    get_region_from_image_uri,
+    get_repository_and_tag_from_image_uri,
+    get_repository_local_path,
     is_canary_context,
     is_dlc_cicd_context,
+    is_nightly_context,
+    login_to_ecr_registry,
     run_cmd_on_container,
     start_container,
     stop_and_remove_container,
-    get_repository_local_path,
-    get_repository_and_tag_from_image_uri,
-    get_python_version_from_image_uri,
-    get_pytorch_version_from_autogluon_image,
-    get_cuda_version_from_tag,
-    get_labels_from_ecr_image,
-    get_buildspec_path,
-    get_all_the_tags_of_an_image_from_ecr,
-    is_nightly_context,
-    execute_env_variables_test,
-    AL2023_BASE_DLAMI_ARM64_US_WEST_2,
-    get_installed_python_packages_with_version,
-    login_to_ecr_registry,
-    get_account_id_from_image_uri,
-    get_region_from_image_uri,
-    DockerImagePullException,
-    get_installed_python_packages_with_version,
-    get_installed_python_packages_using_image_uri,
-    get_image_spec_from_buildspec,
 )
 
+import boto3
+import botocore
+import pytest
+import requests
+from botocore.exceptions import ClientError
+from invoke.context import Context
+from packaging.specifiers import SpecifierSet
+from packaging.version import Version
+from urllib3.util.retry import Retry
+
+import src.utils as src_utils
+from src.buildspec import Buildspec
+
 
 def tail_n_lines(fname, n):
     try:
@@ -112,9 +109,10 @@ def test_stray_files(image):
 
     :param image: ECR image URI
     """
-    if "vllm" in image:
+    upstream_types = ["vllm", "sglang"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vLLM images do not require pip check as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require pip check as they are managed by upstream devs. Skipping test."
         )
 
     ctx = Context()
@@ -585,9 +583,10 @@ def test_pip_check(image):
 
     :param image: ECR image URI
     """
-    if "vllm" in image:
+    upstream_types = ["vllm", "sglang"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vLLM images do not require pip check as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require pip check as they are managed by upstream devs. Skipping test."
         )
 
     allowed_exceptions = []
@@ -733,9 +732,10 @@ def test_cuda_paths(gpu):
     :param gpu: gpu image uris
     """
     image = gpu
-    if "base" in image or "vllm" in image:
+    general_types = ["base", "vllm", "sglang"]
+    if any(t in image for t in general_types):
         pytest.skip(
-            "Base/vLLM DLC doesn't have the same directory structure and buildspec as other images"
+            f"{', '.join(general_types)} DLC doesn't have the same directory structure and buildspec as other images"
         )
     if "example" in image:
         pytest.skip("Skipping Example Dockerfiles which are not explicitly tied to a cuda version")
@@ -1070,8 +1070,9 @@ def test_license_file(image):
     """
     Check that license file within the container is readable and valid
     """
-    if "base" in image or "vllm" in image:
-        pytest.skip("Base DLC has doesn't embed license.txt. Skipping test.")
+    general_types = ["base", "vllm", "sglang"]
+    if any(t in image for t in general_types):
+        pytest.skip(f"{', '.join(general_types)} DLC doesn't embed license.txt. Skipping test.")
 
     framework, version = get_framework_and_version_from_tag(image)
 
@@ -1194,8 +1195,10 @@ def test_core_package_version(image):
     In this test, we ensure that if a core_packages.json file exists for an image, the packages installed in the image
     satisfy the version constraints specified in the core_packages.json file.
     """
-    if "base" in image or "vllm" in image:
-        pytest.skip("Base/vLLM images do not have core packages. Skipping test.")
+    general_types = ["base", "vllm", "sglang"]
+    if any(t in image for t in general_types):
+        pytest.skip(f"{', '.join(general_types)} images do not have core packages. Skipping test.")
+
     core_packages_path = src_utils.get_core_packages_path(image)
     if not os.path.exists(core_packages_path):
         pytest.skip(f"Core packages file {core_packages_path} does not exist for {image}")

test/dlc_tests/sanity/test_safety_report_file.py

@@ -73,10 +73,13 @@ def test_safety_file_exists_and_is_valid(image):
         pytest.skip(
             "Base images do not require safety file as there isn't much python libs in it. Skipping test."
         )
-    if "vllm" in image:
+
+    upstream_types = ["vllm", "sglang"]
+    if any(t in image for t in upstream_types):
         pytest.skip(
-            "vllm images do not require safety file as they are managed by vLLM devs. Skipping test."
+            f"{', '.join(upstream_types)} images do not require safety file as they are managed by upstream devs. Skipping test."
         )
+
     repo_name, image_tag = image.split("/")[-1].split(":")
     # Make sure this container name doesn't conflict with the safety check test container name
     container_name = f"{repo_name}-{image_tag}-safety-file"