From 9a4e13241f6c7f151ad16d1e841388200679023f Mon Sep 17 00:00:00 2001
From: "Jorge E. Moreira" <jemoreira@google.com>
Date: Fri, 8 Mar 2024 14:09:45 -0800
Subject: [PATCH] Add gsi builds to presubmit tests

---
 e2etests/BUILD                   | 30 ++++++++++++++++++++++++++++++
 e2etests/launch_cvd_boot_test.sh |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/e2etests/BUILD b/e2etests/BUILD
index f46881674d..166fd54457 100644
--- a/e2etests/BUILD
+++ b/e2etests/BUILD
@@ -6,3 +6,33 @@ launch_cvd_boot_test(
   target="aosp_cf_x86_64_phone-trunk_staging-userdebug"
 )
 
+launch_cvd_boot_test(
+  name="aosp_android14_phone",
+  branch="aosp-android14-gsi",
+  target="aosp_cf_x86_64_phone-userdebug"
+)
+
+launch_cvd_boot_test(
+  name="aosp_android13_phone",
+  branch="aosp-android13-gsi",
+  target="aosp_cf_x86_64_phone-userdebug"
+)
+
+launch_cvd_boot_test(
+  name="aosp_android12_phone",
+  branch="aosp-android12-gsi",
+  target="aosp_cf_x86_64_phone-userdebug"
+)
+
+launch_cvd_boot_test(
+  name="aosp_android11_phone",
+  branch="aosp-android11-gsi",
+  target="aosp_cf_x86_64_phone-userdebug"
+)
+
+launch_cvd_boot_test(
+  name="aosp_android10_phone",
+  branch="aosp-android10-gsi",
+  target="aosp_cf_x86_64_phone-userdebug"
+)
+
diff --git a/e2etests/launch_cvd_boot_test.sh b/e2etests/launch_cvd_boot_test.sh
index beaf1589ad..0b12ec4971 100755
--- a/e2etests/launch_cvd_boot_test.sh
+++ b/e2etests/launch_cvd_boot_test.sh
@@ -55,6 +55,6 @@ cvd fetch --default_build="${BRANCH}/${TARGET}" --target_directory="${workdir}"
 
 (
   cd "${workdir}"
-  HOME=$(pwd) bin/launch_cvd --daemon --report_anonymous_usage_stats=y
+  HOME=$(pwd) bin/launch_cvd --daemon --report_anonymous_usage_stats=y --undefok=report_anonymous_usage_stats
   HOME=$(pwd) bin/stop_cvd
 )