diff --git a/e2etests/cvd/cvd_create_tests/main_test.go b/e2etests/cvd/cvd_create_tests/main_test.go index 36ad9da854b..4d665d70445 100644 --- a/e2etests/cvd/cvd_create_tests/main_test.go +++ b/e2etests/cvd/cvd_create_tests/main_test.go @@ -38,6 +38,14 @@ func TestCvdCreate(t *testing.T) { branch: "git_main-throttled-nightly", target: "aosp_cf_x86_64_auto-trunk_staging-userdebug", }, + { + branch: "git_main", + target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug", + }, + { + branch: "git_main", + target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug", + }, } c := e2etests.TestContext{} for _, tc := range testcases { diff --git a/e2etests/cvd/cvd_load_tests/main_test.go b/e2etests/cvd/cvd_load_tests/main_test.go index 7ca46517d49..dbd87cf72b2 100644 --- a/e2etests/cvd/cvd_load_tests/main_test.go +++ b/e2etests/cvd/cvd_load_tests/main_test.go @@ -133,6 +133,44 @@ func TestCvdLoad(t *testing.T) { "common": { "host_package": "@ab\/aosp-android-latest-release\/aosp_cf_x86_64_only_phone-userdebug" } +}`, + }, + { + name: "GitMainSDVMULTI", + loadconfig: ` +{ + "instances": [ + { + "name": "core", + "disk": { + "default_build": "@ab\/git_main\/aosp_cf_x86_64_sdv_core-trunk_staging-userdebug" + }, + "vm": { + "cpus": 2, + "memory_mb": 4096 + }, + "graphics": { + "displays": [], + "record_screen": false + } + }, + { + "name": "media", + "disk": { + "default_build": "@ab\/git_main\/aosp_cf_x86_64_sdv_media-trunk_staging-userdebug" + }, + "vm": { + "cpus": 2, + "memory_mb": 4096 + } + } + ], + "metrics": { + "enable": true + }, + "common": { + "host_package": "@ab\/git_main\/aosp_cf_x86_64_only_phone-trunk_staging-userdebug" + } }`, }, } diff --git a/e2etests/cvd/launch_cvd_tests/main_test.go b/e2etests/cvd/launch_cvd_tests/main_test.go index d2d0e6c5bec..cc0ea8826c2 100644 --- a/e2etests/cvd/launch_cvd_tests/main_test.go +++ b/e2etests/cvd/launch_cvd_tests/main_test.go @@ -31,6 +31,21 @@ func TestLaunchCvd(t *testing.T) { branch: "git_main", target: "aosp_cf_x86_64_only_phone-trunk_staging-userdebug", }, + { + name: "GitMainSDVMedia", + branch: "git_main", + target: "aosp_cf_x86_64_sdv_media-trunk_staging-userdebug", + }, + { + name: "GitMainSDVCore", + branch: "git_main", + target: "aosp_cf_x86_64_sdv_core-trunk_staging-userdebug", + }, + { + name: "GitMainAuto", + branch: "git_main", + target: "aosp_cf_x86_64_auto-trunk_staging-userdebug", + }, { name: "AospMainPhone", branch: "aosp-android-latest-release",