chore(ci): Skip all generated gapic unit tests

.kokoro/build.sh

@@ -37,27 +37,27 @@ RETURN_CODE=0
 
 case ${JOB_TYPE} in
   test)
+    MAVEN_GOAL="test"
     if [[ -n "${BUILD_SUBDIR}" ]]
     then
       echo "Compiling and building all modules for ${BUILD_SUBDIR}"
       install_modules "${BUILD_SUBDIR}"
       echo "Running in subdir: ${BUILD_SUBDIR}"
       pushd "${BUILD_SUBDIR}"
-      EXTRA_PROFILE_OPTS=()
     else
-      EXTRA_PROFILE_OPTS=("-PbulkTests")
-      install_modules "sdk-platform-java"
+      # These are pure GAPIC-generated modules with no unit tests to run here; Showcase
+      # integration tests already cover the generated code's behavior, so this pass only
+      # needs to confirm everything compiles.
+      MAVEN_GOAL="compile"
     fi
-    echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
+    echo "MAVEN_GOAL: ${MAVEN_GOAL}"
     retry_with_backoff 3 10 \
-      mvn install \
+      mvn ${MAVEN_GOAL} \
         -B -ntp \
         -Pquick-build \
         -Dorg.slf4j.simpleLogger.showDateTime=true \
         -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-        -Dmaven.wagon.http.retryHandler.count=5 \
-        --also-make \
-        ${SUREFIRE_JVM_OPT} "${EXTRA_PROFILE_OPTS[@]}"
+        -Dmaven.wagon.http.retryHandler.count=5
     RETURN_CODE=$?
 
     if [[ -n "${BUILD_SUBDIR}" ]]
@@ -316,7 +316,6 @@ case ${JOB_TYPE} in
       install_modules "${BUILD_SUBDIR}"
       echo "Running in subdir: ${BUILD_SUBDIR}"
       pushd "${BUILD_SUBDIR}"
-      EXTRA_PROFILE_OPTS=()
     else
       install_modules "sdk-platform-java"
     fi
@@ -349,4 +348,4 @@ if [[ "${ENABLE_FLAKYBOT}" == "true" ]]; then
 fi
 
 echo "exiting with ${RETURN_CODE}"
-exit ${RETURN_CODE}
+exit ${RETURN_CODE}

.kokoro/common.sh

@@ -311,6 +311,11 @@ function run_integration_tests() {
   parse_all_submodules "$1"
   printf "Running integration tests for submodules:\n%s\n" "$all_submodules"
 
+  # Skip only unit tests, not ITs: -DskipUnitTests=true for client-library modules (see
+  # google-cloud-jar-parent/pom.xml for how that's wired) and -PbulkTests for the handful of
+  # modules (google-auth-library-java, java-cloud-bom, java-shared-config,
+  # sdk-platform-java) that predate and sit outside that mechanism. Both flags are passed
+  # unconditionally; Maven ignores whichever one a given module doesn't recognize.
   mvn verify -Penable-integration-tests -Pquick-build --projects "$all_submodules" \
     ${INTEGRATION_TEST_ARGS} \
     -B -ntp -fae \
@@ -416,6 +421,7 @@ function install_modules() {
     printf "Installing submodules:\n%s\n" "$all_submodules"
 
     always_install_deps_list=(
+      'grpc-gcp-java'
       'java-monitoring/google-cloud-monitoring'
       'java-monitoring/google-cloud-monitoring-bom'
       'google-auth-library-java/appengine'

google-cloud-jar-parent/pom.xml

@@ -19,7 +19,22 @@
     <relativePath>../google-cloud-pom-parent/pom.xml</relativePath>
   </parent>
   <properties>
-    <skipUnitTests>false</skipUnitTests>
+    <!--
+      Defaults to true: most modules under this parent are pure GAPIC-generated clients whose
+      generated tests aren't worth the CI time. Libraries with handwritten tests worth
+      running (java-spanner, java-bigtable, java-storage, ...) override this back to false in
+      their own top-level pom.xml.
+
+      Wired only into surefire's <skip> (below), not Maven's built-in skipTests, so it skips
+      unit tests without also skipping failsafe/ITs.
+    -->
+    <skipUnitTests>true</skipUnitTests>
+    <!--
+      Mirrors skipUnitTests, so test compilation is skipped along with execution. The
+      enable-integration-tests profile overrides this to false so ITs still compile and run
+      when -DskipUnitTests=true is set.
+    -->
+    <maven.test.skip>${skipUnitTests}</maven.test.skip>
     <ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->
   </properties>
 
@@ -171,6 +186,12 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>enable-integration-tests</id>
+      <properties>
+        <maven.test.skip>false</maven.test.skip>
+      </properties>
+    </profile>
     <profile>
       <id>java17</id>
       <activation>

java-bigquery-jdbc/pom.xml

@@ -32,6 +32,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-bigquery-jdbc</site.installationModule>
     <skipShade>false</skipShade>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <build>
@@ -412,14 +413,6 @@
       </build>
     </profile>
 
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
-
     <!-- Profile used inside docker -->
     <profile>
       <id>docker</id>

java-bigquery/pom.xml

@@ -56,6 +56,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-bigquery-parent</site.installationModule>
     <google-api-services-bigquery.version>v2-rev20251012-2.0.0</google-api-services-bigquery.version>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -162,12 +163,5 @@
         <module>benchmark</module>
       </modules>
     </profile>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
   </profiles>
 </project>

java-bigquerystorage/pom.xml

@@ -56,6 +56,7 @@
     <project.protobuf-java.version>3.25.4</project.protobuf-java.version>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-bigquerystorage-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <pluginRepositories>
@@ -207,14 +208,4 @@
     <module>google-cloud-bigquerystorage-bom</module>
   </modules>
 
-  <profiles>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>

java-bigtable/pom.xml

@@ -146,6 +146,7 @@
         <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
         <errorprone.version>2.48.0</errorprone.version>
         <errorprone.javac.args>-g</errorprone.javac.args>
+        <skipUnitTests>false</skipUnitTests>
     </properties>
 
     <dependencyManagement>
@@ -342,12 +343,6 @@
                 </plugins>
             </build>
         </profile>
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
     <profile>
       <id>errorprone-jdk8</id>
       <activation>

java-common-protos/pom.xml

@@ -43,6 +43,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>

java-datastore/pom.xml

@@ -146,6 +146,7 @@
     <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
     <errorprone.version>2.48.0</errorprone.version>
     <errorprone.javac.args>-g</errorprone.javac.args>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -236,13 +237,6 @@
   </modules>
 
   <profiles>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
     <profile>
       <id>errorprone-jdk8</id>
       <activation>

java-dns/pom.xml

@@ -22,6 +22,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-dns-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>

java-firestore/google-cloud-firestore-admin/pom.xml

@@ -15,6 +15,9 @@
     <artifactId>google-cloud-firestore-parent</artifactId>
     <version>3.45.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
   </parent>
+  <properties>
+    <skipUnitTests>true</skipUnitTests>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.google.api.grpc</groupId>

java-firestore/pom.xml

@@ -144,6 +144,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-firestore-parent</site.installationModule>
     <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -247,11 +248,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
   </profiles>
 </project>

java-iam/pom.xml

@@ -43,6 +43,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>

java-logging-logback/pom.xml

@@ -20,6 +20,7 @@
     <logging.version>3.25.0</logging.version>
     <slf4j.version>1.7.36</slf4j.version>
     <google.api-common.version>1.10.1</google.api-common.version>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <parent>
@@ -170,12 +171,5 @@
         <test>!LoggingAppenderTest</test>
       </properties>
     </profile>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
   </profiles>
 </project>

java-logging/pom.xml

@@ -55,6 +55,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-logging-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -105,14 +106,4 @@
     <!-- {x-generated-modules-end} -->
     <module>google-cloud-logging-bom</module>
   </modules>
-
-  <profiles>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
-  </profiles>
 </project>

java-notification/pom.xml

@@ -20,6 +20,7 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-notification</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
   <dependencyManagement>
     <dependencies>

java-pubsub/pom.xml

@@ -55,6 +55,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-pubsub-parent</site.installationModule>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -143,13 +144,4 @@
     <!-- {x-generated-modules-end} -->
     <module>google-cloud-pubsub-bom</module>
   </modules>
-
-  <profiles>
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
-  </profiles>
 </project>

java-showcase/pom.xml

@@ -27,6 +27,7 @@
     <maven.deploy.skip>true</maven.deploy.skip>
     <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
     <mdep.analyze.skip>true</mdep.analyze.skip><!-- The showcase modules are not meant for library customers. -->
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -259,12 +260,5 @@
         </plugins>
       </build>
     </profile>
-    <!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
-    <profile>
-      <id>bulkTests</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-    </profile>
   </profiles>
 </project>

java-spanner-jdbc/pom.xml

@@ -55,6 +55,7 @@
     <truth.version>1.4.5</truth.version>
     <mockito.version>4.11.0</mockito.version>
     <opencensus.version>0.31.1</opencensus.version>
+    <skipUnitTests>false</skipUnitTests>
   </properties>
 
   <dependencyManagement>
@@ -345,7 +346,7 @@
                 <argument>${project.basedir}/documentation/connection_properties.md</argument>
               </arguments>
               <classpathScope>test</classpathScope>
-              <skip>false</skip>
+              <skip>${maven.test.skip}</skip>
             </configuration>          </execution>
         </executions>
       </plugin>