Skip to content

Commit d3d812d

Browse files
committed
test: skip unit tests for modules that have their own split tests
1 parent 6d03337 commit d3d812d

4 files changed

Lines changed: 31 additions & 2 deletions

File tree

.kokoro/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ case ${JOB_TYPE} in
4343
install_modules "${BUILD_SUBDIR}"
4444
echo "Running in subdir: ${BUILD_SUBDIR}"
4545
pushd "${BUILD_SUBDIR}"
46+
EXTRA_PROFILE_OPT=""
47+
else
48+
EXTRA_PROFILE_OPT="-PbulkTests"
4649
fi
4750
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
51+
echo "EXTRA_PROFILE_OPT: ${EXTRA_PROFILE_OPT}"
4852
retry_with_backoff 3 10 \
4953
mvn test \
5054
-B -ntp \
@@ -56,7 +60,7 @@ case ${JOB_TYPE} in
5660
-Dflatten.skip=true \
5761
-Danimal.sniffer.skip=true \
5862
-Dmaven.wagon.http.retryHandler.count=5 \
59-
-T 1C ${SUREFIRE_JVM_OPT}
63+
${SUREFIRE_JVM_OPT} ${EXTRA_PROFILE_OPT}
6064
RETURN_CODE=$?
6165

6266
if [[ -n "${BUILD_SUBDIR}" ]]

java-bigquerystorage/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,13 @@
210210
<module>tutorials</module>
211211
</modules>
212212
</profile>
213+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
214+
<profile>
215+
<id>bulkTests</id>
216+
<properties>
217+
<skipTests>true</skipTests>
218+
</properties>
219+
</profile>
213220
</profiles>
214221

215222
</project>

java-datastore/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,13 @@
232232
<module>google-cloud-datastore-utils</module>
233233
</modules>
234234

235-
</project>
235+
<profiles>
236+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
237+
<profile>
238+
<id>bulkTests</id>
239+
<properties>
240+
<skipTests>true</skipTests>
241+
</properties>
242+
</profile>
243+
</profiles>
244+
</project>

java-logging/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@
9393
</plugins>
9494
</pluginManagement>
9595
</build>
96+
<profiles>
97+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
98+
<profile>
99+
<id>bulkTests</id>
100+
<properties>
101+
<skipTests>true</skipTests>
102+
</properties>
103+
</profile>
104+
</profiles>
96105

97106
<modules>
98107
<module>google-cloud-logging</module>

0 commit comments

Comments
 (0)