From f432964a5b3e49fe1e5c8d62edfeec9b33584a31 Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Tue, 30 Jun 2026 16:48:02 +0000 Subject: [PATCH] e2etests/cvd: add basic testing for sdv Bug: b/507906785 Test: bazel build --- e2etests/cvd/cvd_create_tests/main_test.go | 23 +++++++- e2etests/cvd/cvd_load_tests/main_test.go | 65 ++++++++++++++++++++++ e2etests/cvd/launch_cvd_tests/main_test.go | 30 +++++++++- 3 files changed, 116 insertions(+), 2 deletions(-) diff --git a/e2etests/cvd/cvd_create_tests/main_test.go b/e2etests/cvd/cvd_create_tests/main_test.go index 36ad9da854b..c2c84bb567d 100644 --- a/e2etests/cvd/cvd_create_tests/main_test.go +++ b/e2etests/cvd/cvd_create_tests/main_test.go @@ -25,6 +25,7 @@ func TestCvdCreate(t *testing.T) { testcases := []struct { branch string target string + args []string }{ { branch: "aosp-android-latest-release", @@ -38,6 +39,24 @@ func TestCvdCreate(t *testing.T) { branch: "git_main-throttled-nightly", target: "aosp_cf_x86_64_auto-trunk_staging-userdebug", }, + { + branch: "git_main-swcar-dev", + target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug", + args: []string{ + "--enable_sandbox=true", + "--guest_enforce_security=false", + "--extra_bootconfig_args=androidboot.sdv.instance_name=instance1 androidboot.virt.address=3 androidboot.sdv.boot_mode=unlocked", + }, + }, + { + branch: "git_main-swcar-dev", + target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug", + args: []string{ + "--enable_sandbox=true", + "--guest_enforce_security=false", + "--extra_bootconfig_args=androidboot.sdv.instance_name=instance1 androidboot.virt.address=3 androidboot.sdv.boot_mode=unlocked", + }, + }, } c := e2etests.TestContext{} for _, tc := range testcases { @@ -52,7 +71,9 @@ func TestCvdCreate(t *testing.T) { t.Fatal(err) } - if err := c.CVDCreate(e2etests.CreateArgs{}); err != nil { + if err := c.CVDCreate(e2etests.CreateArgs{ + Args: tc.args, + }); err != nil { t.Fatal(err) } diff --git a/e2etests/cvd/cvd_load_tests/main_test.go b/e2etests/cvd/cvd_load_tests/main_test.go index 646ccfb76b9..5ead0d1dfb0 100644 --- a/e2etests/cvd/cvd_load_tests/main_test.go +++ b/e2etests/cvd/cvd_load_tests/main_test.go @@ -107,6 +107,71 @@ func TestCvdLoad(t *testing.T) { "common": { "host_package": "@ab\/aosp-android-latest-release\/aosp_cf_x86_64_only_phone-userdebug" } +}`, + }, + { + name: "GitSwCarDevSdv", + loadconfig: ` +{ + "instances": [ + { + "name": "ins-1", + "vm": { + "cpus": 2, + "memory_mb": 2048, + "crosvm": { + "enable_sandbox": true + } + }, + "boot": { + "extra_bootconfig_args": "androidboot.sdv.instance_name=instance1 androidboot.virt.address=3 androidboot.sdv.boot_mode=unlocked" + }, + "security": { + "guest_enforce_security": false + }, + "disk": { + "default_build": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_core-trunk_staging-userdebug" + }, + "graphics": { + "gpu_mode": "none" + } + }, + { + "name": "ins-2", + "vm": { + "cpus": 4, + "memory_mb": 4096, + "crosvm": { + "enable_sandbox": true + } + }, + "boot": { + "extra_bootconfig_args": "androidboot.sdv.instance_name=instance2 androidboot.virt.address=4 androidboot.sdv.boot_mode=unlocked" + }, + "security": { + "guest_enforce_security": false + }, + "disk": { + "default_build": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_media-trunk_staging-userdebug" + }, + "graphics": { + "displays": [ + { + "width": 1920, + "height": 1080 + } + ], + "gpu_mode": "gfxstream_guest_angle_host_swiftshader" + } + } + ], + "netsim_bt": false, + "metrics": { + "enable": true + }, + "common": { + "host_package": "@ab\/git_main-swcar-dev\/aosp_cf_x86_64_sdv_media-trunk_staging-userdebug" + } }`, }, } diff --git a/e2etests/cvd/launch_cvd_tests/main_test.go b/e2etests/cvd/launch_cvd_tests/main_test.go index fcaa89db5d2..a99ec9062a3 100644 --- a/e2etests/cvd/launch_cvd_tests/main_test.go +++ b/e2etests/cvd/launch_cvd_tests/main_test.go @@ -25,6 +25,7 @@ func TestLaunchCvd(t *testing.T) { name string branch string target string + args []string }{ { name: "GitMainPhone", @@ -61,6 +62,31 @@ func TestLaunchCvd(t *testing.T) { branch: "git_android16-car-release", target: "aosp_cf_x86_64_auto-userdebug", }, + { + name: "Car17Auto", + branch: "git_android17-car-release", + target: "aosp_cf_x86_64_auto-userdebug", + }, + { + name: "GitSwCarDevSdvCore", + branch: "git_main-swcar-dev", + target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug", + args: []string{ + "--enable_sandbox=true", + "--guest_enforce_security=false", + "--extra_bootconfig_args=androidboot.sdv.instance_name=instance1 androidboot.virt.address=3 androidboot.sdv.boot_mode=unlocked", + }, + }, + { + name: "GitSwCarDevSdvMedia", + branch: "git_main-swcar-dev", + target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug", + args: []string{ + "--enable_sandbox=true", + "--guest_enforce_security=false", + "--extra_bootconfig_args=androidboot.sdv.instance_name=instance1 androidboot.virt.address=3 androidboot.sdv.boot_mode=unlocked", + }, + }, { name: "Aosp11GsiPhone", branch: "aosp-android11-gsi", @@ -80,7 +106,9 @@ func TestLaunchCvd(t *testing.T) { t.Fatal(err) } - if err := c.LaunchCVD(e2etests.CreateArgs{}); err != nil { + if err := c.LaunchCVD(e2etests.CreateArgs{ + Args: tc.args, + }); err != nil { t.Fatal(err) }