Skip to content

e2etests/cvd: add basic testing for sdv #2796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chihchiachen wants to merge 1 commit into
base: main
Choose a base branch
from
+116 −2
Open

e2etests/cvd: add basic testing for sdv #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion e2etests/cvd/cvd_create_tests/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestCvdCreate(t *testing.T) {
testcases := []struct {
branch string
target string
args []string
}{
{
branch: "aosp-android-latest-release",
Expand All @@ -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 {
Expand All @@ -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)
}

Expand Down
65 changes: 65 additions & 0 deletions e2etests/cvd/cvd_load_tests/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}`,
},
}
Expand Down
30 changes: 29 additions & 1 deletion e2etests/cvd/launch_cvd_tests/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestLaunchCvd(t *testing.T) {
name string
branch string
target string
args []string
}{
{
name: "GitMainPhone",
Expand Down Expand Up @@ -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",
},
},
Comment thread
chihchiachen marked this conversation as resolved.
{
name: "Aosp11GsiPhone",
branch: "aosp-android11-gsi",
Expand All @@ -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)
}

Expand Down
Loading