Skip to content

Replace e2e cvd runner scripts with shared go library #2170

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

Merged
jmacnak merged 1 commit into from
Mar 2, 2026
Merged

Replace e2e cvd runner scripts with shared go library #2170

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
6 changes: 3 additions & 3 deletions .kokoro/presubmit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ build_file: "android-cuttlefish/.kokoro/presubmit.sh"

action {
define_artifacts {
regex: "*/*sponge_log.xml" # Actually a glob, not a regex
regex: "*/*sponge_log.log"
regex: "*/device_logs/**" # match all files regardless of directory depth
regex: "github/android-cuttlefish/*.deb"

# Matches all files regardless of directory depth:
regex: "kokoro_test_results/**"
}
}
6 changes: 3 additions & 3 deletions .kokoro/presubmit_gpu.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ env_vars {

action {
define_artifacts {
regex: "*/*sponge_log.xml" # Actually a glob, not a regex
regex: "*/*sponge_log.log"
regex: "*/device_logs/**" # match all files regardless of directory depth
regex: "github/android-cuttlefish/*.deb"

# Matches all files regardless of directory depth:
regex: "kokoro_test_results/**"
}
}
2 changes: 1 addition & 1 deletion e2etests/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bazel_dep(name = "rules_python", version = "1.1.0")
bazel_dep(name = "rules_shell", version = "0.6.1")

go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.23.1")
go_sdk.download(version = "1.24.0")

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
Expand Down
196 changes: 13 additions & 183 deletions e2etests/cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,185 +1,15 @@
load("@rules_python//python:defs.bzl", "py_library", "py_test")
load("boot_tests.bzl", "cvd_command_boot_test", "cvd_cts_test", "cvd_load_boot_test", "launch_cvd_boot_test", "metrics_test")

py_library(
name = "convert_xts_xml_to_junit_xml",
srcs = ["convert_xts_xml_to_junit_xml.py"],
srcs_version = "PY3",
)

py_test(
name = "convert_xts_xml_to_junit_xml_test",
srcs = ["convert_xts_xml_to_junit_xml_test.py"],
srcs_version = "PY3",
deps = [":convert_xts_xml_to_junit_xml"],
)

py_binary(
name = "convert_xts_xml_to_junit_xml_bin",
srcs = ["convert_xts_xml_to_junit_xml.py"],
srcs_version = "PY3",
main = "convert_xts_xml_to_junit_xml.py",
)

# cvd fetch + launch_cvd tests
launch_cvd_boot_test(
name = "fetch_and_launch_git_main_x64_phone",
branch = "git_main",
target = "aosp_cf_x86_64_only_phone-trunk_staging-userdebug",
)

launch_cvd_boot_test(
name = "fetch_and_launch_aosp_main_x64_phone",
branch = "aosp-android-latest-release",
target = "aosp_cf_x86_64_only_phone-userdebug",
)

launch_cvd_boot_test(
name = "fetch_and_launch_aosp_android14_phone",
branch = "aosp-android14-gsi",
target = "aosp_cf_x86_64_phone-userdebug",
)

launch_cvd_boot_test(
name = "fetch_and_launch_aosp_android13_phone",
branch = "aosp-android13-gsi",
target = "aosp_cf_x86_64_phone-userdebug",
)

launch_cvd_boot_test(
name = "fetch_and_launch_aosp_android12_phone",
branch = "aosp-android12-gsi",
target = "aosp_cf_x86_64_phone-userdebug",
)

# cvd load tests
cvd_load_boot_test(
name = "load_git_main_x64_phone",
env_file = "environment_specs/git_main_x64_phone.json",
)

cvd_load_boot_test(
name = "load_aosp_main_x64_phone",
env_file = "environment_specs/aosp_main_x64_phone.json",
)

cvd_load_boot_test(
name = "load_aosp_main_x64_phone_x2",
size = "enormous",
env_file = "environment_specs/aosp_main_x64_phone_x2.json",
)

cvd_command_boot_test(
name = "list_env_services",
branch = "aosp-android-latest-release",
cvd_command = [
"env",
"ls",
],
target = "aosp_cf_x86_64_only_phone-userdebug",
)

cvd_command_boot_test(
name = "take_bugreport",
branch = "aosp-android-latest-release",
cvd_command = ["host_bugreport"],
target = "aosp_cf_x86_64_only_phone-userdebug",
)

cvd_command_boot_test(
name = "add_displays",
branch = "aosp-android-latest-release",
cvd_command = [
"display",
"add",
"--display=width=500,height=500",
],
target = "aosp_cf_x86_64_only_phone-userdebug",
)

cvd_command_boot_test(
name = "list_displays",
branch = "aosp-android-latest-release",
cvd_command = [
"display",
"list",
],
target = "aosp_cf_x86_64_only_phone-userdebug",
)

metrics_test(
name = "verify_metrics_transmission",
branch = "aosp-android-latest-release",
target = "aosp_cf_x86_64_only_phone-userdebug",
)

cvd_cts_test(
name = "aosp_android_latest_auto_enables_gfxstream_test",
cuttlefish_branch = "aosp-android-latest-release",
cuttlefish_target = "aosp_cf_x86_64_only_phone-userdebug",
cuttlefish_create_args = [
"--gpu_mode=auto",
],
cts_branch = "aosp-android15-tests-release",
cts_target = "test_suites_x86_64",
cts_args = [
"--include-filter=CuttlefishGraphicsConfigurationTest",
"--module-arg=CuttlefishGraphicsConfigurationTest:set-option:expected-egl:emulation",
],
tags = ["requires_gpu"],
)

cvd_cts_test(
name = "aosp_android_latest_gfxstream_deqp_vk_smoke_tests",
cuttlefish_branch = "aosp-android-latest-release",
cuttlefish_target = "aosp_cf_x86_64_only_phone-userdebug",
cuttlefish_create_args = [
"--gpu_mode=gfxstream",
],
cts_branch = "aosp-android15-tests-release",
cts_target = "test_suites_x86_64",
cts_args = [
"--include-filter=CtsDeqpTestCases",
"--module-arg=CtsDeqpTestCases:include-filter:dEQP-VK.api.smoke*",
],
tags = ["requires_gpu"],
)

cvd_cts_test(
name = "aosp_android_latest_gfxstream_guest_angle_host_swiftshader_deqp_vk_smoke_tests",
cuttlefish_branch = "aosp-android-latest-release",
cuttlefish_target = "aosp_cf_x86_64_only_phone-userdebug",
cuttlefish_create_args = [
"--gpu_mode=gfxstream_guest_angle_host_swiftshader",
],
cts_branch = "aosp-android15-tests-release",
cts_target = "test_suites_x86_64",
cts_args = [
"--include-filter=CtsDeqpTestCases",
"--module-arg=CtsDeqpTestCases:include-filter:dEQP-VK.api.smoke*",
],
# This does not actually require a GPU but currently only the GPU image
# has the XTS requirements preinstalled.
tags = ["requires_gpu"],
)

cvd_cts_test(
name = "aosp_android_latest_gfxstream_guest_angle_host_swiftshader_graphics_cts_tests",
cuttlefish_branch = "aosp-android-latest-release",
cuttlefish_target = "aosp_cf_x86_64_only_phone-userdebug",
cuttlefish_create_args = [
"--gpu_mode=gfxstream_guest_angle_host_swiftshader",
],
cts_branch = "aosp-android15-tests-release",
cts_target = "test_suites_x86_64",
cts_args = [
"--include-filter=CtsGraphicsTestCases",
"--include-filter=CtsNativeHardwareTestCases",
"--include-filter=CtsUiRenderingTestCases",
],
# This does not actually require a GPU but currently only the GPU image
# has the XTS requirements preinstalled.
tags = ["requires_gpu"],
)
# Copyright (C) 2026 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# TODO(b/329100411) test loading older branches
164 changes: 0 additions & 164 deletions e2etests/cvd/boot_tests.bzl
View file
Open in desktop

This file was deleted.

Loading
Loading