From 335f5f8a84b2c010aa048fe8b9e2ea8c28479492 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 16 Jun 2026 17:29:57 +0000
Subject: [PATCH 1/3] ci: disable generated GAPIC unit tests by default

---
 google-cloud-jar-parent/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index 20fa3e5ec4a7..645a99e6dac3 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -219,6 +219,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>${skipUnitTests}</skip>
+          <excludes>
+            <exclude>**/v*/*ClientTest.java</exclude>
+            <exclude>**/v*/*ClientHttpJsonTest.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>

From e67b010c829a5eb708c207bb5412d3cee2b8cb18 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 16 Jun 2026 18:33:47 +0000
Subject: [PATCH 2/3] chore: Update regex to remove the generated tests only

---
 google-cloud-jar-parent/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index 645a99e6dac3..aa12beff2dae 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -220,6 +220,8 @@
         <configuration>
           <skip>${skipUnitTests}</skip>
           <excludes>
+            <!-- We are excluding generated client unit tests to save CI time. -->
+            <!-- We use the narrow v*/* pattern (single asterisk) to protect manual tests in sub-packages (like v1/client/ or v2/internal/api/). -->
             <exclude>**/v*/*ClientTest.java</exclude>
             <exclude>**/v*/*ClientHttpJsonTest.java</exclude>
           </excludes>

From 4cb7f32b66f1e3380e365e168bbe8244f5a225dc Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 16 Jun 2026 19:10:32 +0000
Subject: [PATCH 3/3] chore: Add small exclusion for BQstorage

---
 google-cloud-jar-parent/pom.xml                      | 12 ++++++++----
 .../google-cloud-bigquerystorage/pom.xml             |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index aa12beff2dae..ecd93ecdb973 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -21,6 +21,7 @@
   <properties>
     <skipUnitTests>false</skipUnitTests>
     <ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->
+    <surefire.excludes>**/v*/*ClientTest.java,**/v*/*ClientHttpJsonTest.java</surefire.excludes>
   </properties>
 
   <dependencyManagement>
@@ -219,11 +220,14 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>${skipUnitTests}</skip>
+          <!-- Exclude generated client unit tests directly under versioned packages (e.g., v1, v2)
+               to save CI execution time. We use the narrow 'v*/*' pattern (single asterisk)
+               instead of 'v*/**' to ensure we do not exclude manually written unit tests
+               which live in sub-packages (e.g., v1/client/ or v2/internal/api/). 
+               If a module has customized subclass tests under a versioned package, 
+               override <surefire.excludes/> to empty in its local pom.xml (e.g., google-cloud-bigquerystorage). -->
           <excludes>
-            <!-- We are excluding generated client unit tests to save CI time. -->
-            <!-- We use the narrow v*/* pattern (single asterisk) to protect manual tests in sub-packages (like v1/client/ or v2/internal/api/). -->
-            <exclude>**/v*/*ClientTest.java</exclude>
-            <exclude>**/v*/*ClientHttpJsonTest.java</exclude>
+            <exclude>${surefire.excludes}</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml b/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml
index fdc6eab9271f..4a65f4de0a46 100644
--- a/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml
+++ b/java-bigquerystorage/google-cloud-bigquerystorage/pom.xml
@@ -15,6 +15,7 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-bigquerystorage</site.installationModule>
+    <surefire.excludes></surefire.excludes>
   </properties>
   <dependencyManagement>
     <dependencies>