Adding EC2 tests on vLLM DLC

dlc_developer_config.toml

@@ -37,16 +37,16 @@ deep_canary_mode = false
 [build]
 # Add in frameworks you would like to build. By default, builds are disabled unless you specify building an image.
 # available frameworks - ["base", "vllm", "autogluon", "huggingface_tensorflow", "huggingface_pytorch", "huggingface_tensorflow_trcomp", "huggingface_pytorch_trcomp", "pytorch_trcomp", "tensorflow", "pytorch", "stabilityai_pytorch"]
-build_frameworks = []
+build_frameworks = ["vllm"]
 
 
 # By default we build both training and inference containers. Set true/false values to determine which to build.
-build_training = true
-build_inference = true
+build_training = false
+build_inference = false
 
 # Set do_build to "false" to skip builds and test the latest image built by this PR
 # Note: at least one build is required to set do_build to "false"
-do_build = true
+do_build = false
 
 [notify]
 ### Notify on test failures

test/test_utils/ec2.py

@@ -1817,6 +1817,27 @@ def get_default_subnet_for_az(ec2_client, availability_zone):
     return az_subnet_id
 
 
+def get_subnet_id_by_vpc(ec2_client, vpc_id):
+
+    response = ec2_client.describe_subnets(
+        Filters=[
+            {
+                "Name": "vpc-id",
+                "Values": [
+                    vpc_id,
+                ],
+            },
+        ],
+    )
+
+    subnet_ids = []
+    for subnet in response["Subnets"]:
+        if subnet["SubnetId"] is not None:
+            subnet_ids.append(subnet["SubnetId"])
+
+    return subnet_ids
+
+
 def get_vpc_id_by_name(ec2_client, vpc_name):
     """
     Get VPC ID by VPC name tag

test/testrunner.py

@@ -32,7 +32,7 @@
 )
 from test_utils import KEYS_TO_DESTROY_FILE
 from test_utils.pytest_cache import PytestCache
-
+from vllm.trigger_test import test
 from src.codebuild_environment import get_codebuild_project_name
 
 LOGGER = logging.getLogger(__name__)
@@ -308,15 +308,18 @@ def main():
     build_context = get_build_context()
 
     # Skip non-sanity/security test suites for base or vllm images in MAINLINE context
-    if (
-        build_context == "MAINLINE"
-        and all("base" in image_uri or "vllm" in image_uri for image_uri in all_image_list)
-        and test_type not in {"functionality_sanity", "security_sanity"}
+    if build_context == "MAINLINE" and all(
+        "base" in image_uri or "vllm" in image_uri for image_uri in all_image_list
     ):
-        LOGGER.info(
-            f"NOTE: {specific_test_type} tests not supported on base or vllm images. Skipping..."
-        )
-        return
+        if test_type not in {"functionality_sanity", "security_sanity"}:
+            if test_type in {"ec2", "eks"}:
+                LOGGER.info("Running VLLM EC2 EKS tests...")
+                test()
+            else:
+                LOGGER.info(
+                    f"NOTE: {specific_test_type} tests not supported on base or vllm images. Skipping..."
+                )
+                return
 
     # quick_checks tests don't have images in it. Using a placeholder here for jobs like that
     try:

testspec.yml

@@ -23,7 +23,8 @@ phases:
       - pip install scheduler/.
       - echo Running pytest $TEST_TYPE tests on $DLC_IMAGES...
       - export PYTHONPATH=$PYTHONPATH:$(pwd)/src
-      - python test/testrunner.py
+      # - python test/testrunner.py
+      - python vllm/trigger_test.py
   post_build:
     commands:
       - python src/send_status.py --status $CODEBUILD_BUILD_SUCCEEDING

vllm/buildspec.yml

@@ -49,3 +49,4 @@ images:
       test_platforms:
         - sanity
         - security
+        - ec2