Skip to content

Commit 9e02234

Browse files
committed
skip unit tests for split repos in bulk tests
1 parent aaf6361 commit 9e02234

File tree

7 files changed

+51
-4
lines changed

7 files changed

+51
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
java-bigquery: java-bigquery/**
6161
java-bigquerystorage: java-bigquerystorage/**
6262
java-datastore: java-datastore/**
63+
java-logging: java-logging/**
64+
java-logging-logback: java-logging-logback/**
6365
split-units:
6466
runs-on: ubuntu-latest
6567
needs: changes

.kokoro/build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ 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}"
4851
retry_with_backoff 3 10 \
@@ -56,7 +59,7 @@ case ${JOB_TYPE} in
5659
-Dflatten.skip=true \
5760
-Danimal.sniffer.skip=true \
5861
-Dmaven.wagon.http.retryHandler.count=5 \
59-
-T 1C ${SUREFIRE_JVM_OPT}
62+
-T 1C ${SUREFIRE_JVM_OPT} ${EXTRA_PROFILE_OPT}
6063
RETURN_CODE=$?
6164

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

java-bigquery/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,12 @@
162162
<module>benchmark</module>
163163
</modules>
164164
</profile>
165+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
166+
<profile>
167+
<id>bulkTests</id>
168+
<properties>
169+
<skipTests>true</skipTests>
170+
</properties>
171+
</profile>
165172
</profiles>
166173
</project>

java-bigquerystorage/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,14 @@
202202
<module>google-cloud-bigquerystorage-bom</module>
203203
</modules>
204204

205-
</project>
205+
<profiles>
206+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
207+
<profile>
208+
<id>bulkTests</id>
209+
<properties>
210+
<skipTests>true</skipTests>
211+
</properties>
212+
</profile>
213+
</profiles>
214+
215+
</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-logback/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,12 @@
168168
<test>!LoggingAppenderTest</test>
169169
</properties>
170170
</profile>
171+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
172+
<profile>
173+
<id>bulkTests</id>
174+
<properties>
175+
<skipTests>true</skipTests>
176+
</properties>
177+
</profile>
171178
</profiles>
172179
</project>

java-logging/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,13 @@
101101
<module>google-cloud-logging-bom</module>
102102
</modules>
103103

104-
</project>
104+
<profiles>
105+
<!-- skip tests if bulkTests profile is enabled (when testing the rest of the monorepo) -->
106+
<profile>
107+
<id>bulkTests</id>
108+
<properties>
109+
<skipTests>true</skipTests>
110+
</properties>
111+
</profile>
112+
</profiles>
113+
</project>

0 commit comments

Comments
 (0)