Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,9 @@ jobs:
run: |
mvn test \
-B -ntp \
-PquickBuild \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Dmaven.wagon.http.retryHandler.count=5 \
--also-make \
-T 1C
Expand Down Expand Up @@ -220,7 +216,7 @@ jobs:
- run: java -version
- name: Install Maven modules to local Maven repository
run: |
mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip
mvn install -B -ntp -T 1C -PquickBuild -DskipTests
- run: java -version
- run: mvn -B -ntp enforcer:enforce@enforce -T 1C
gapic-libraries-bom:
Expand All @@ -234,7 +230,7 @@ jobs:
cache: maven
- name: Install Maven modules to local Maven repository
run: |
mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
mvn install -B -ntp -T 1C -PquickBuild -DskipTests
- name: Validate gapic-libraries-bom
uses: googleapis/java-cloud-bom/tests/validate-bom@v26.54.0
with:
Expand Down
55 changes: 25 additions & 30 deletions .github/workflows/sdk-platform-java-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ jobs:
- run: java -version
- name: Unit Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage
working-directory: sdk-platform-java
# The `envVarTest` profile runs tests that require an environment variable
- name: Env Var Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage -PenvVarTest
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage -PenvVarTest
# Set the Env Var for this step only
env:
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
Expand All @@ -51,7 +51,7 @@ jobs:
- run: bazelisk version
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Integration Tests
run: |
Expand Down Expand Up @@ -90,14 +90,14 @@ jobs:
- run: java -version
- name: Unit Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage
working-directory: sdk-platform-java
# The `envVarTest` profile runs tests that require an environment variable
- name: Env Var Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage -PenvVarTest
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage -PenvVarTest
# Set the Env Var for this step only
env:
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
Expand All @@ -107,7 +107,7 @@ jobs:
- run: bazelisk version
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Integration Tests
run: |
Expand All @@ -128,14 +128,14 @@ jobs:
- run: java -version
- name: Unit Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage
working-directory: sdk-platform-java
# The `envVarTest` profile runs tests that require an environment variable
- name: Env Var Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage -PenvVarTest
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage -PenvVarTest
# Set the Env Var for this step only
env:
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
Expand All @@ -145,7 +145,7 @@ jobs:
- run: bazelisk version
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Integration Tests
# note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
Expand Down Expand Up @@ -177,8 +177,7 @@ jobs:
export PATH=${JAVA_HOME}/bin:$PATH
# Maven surefire plugin lets us to specify the JVM when running tests via
# the "jvm" system property.
mvn verify --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip \
mvn verify --batch-mode --no-transfer-progress -PquickBuild \
-Djvm="${JAVA8_HOME}/bin/java"
working-directory: sdk-platform-java
# The `envVarTest` profile runs tests that require an environment variable
Expand All @@ -191,8 +190,8 @@ jobs:
# Maven surefire plugin lets us to specify the JVM when running tests via
# the "jvm" system property.
export GOOGLE_CLOUD_UNIVERSE_DOMAIN=random.com
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
mvn test --batch-mode --no-transfer-progress -PquickBuild \
-DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
-PenvVarTest
# Set the Env Var for this step only
env:
Expand All @@ -216,7 +215,7 @@ jobs:
- name: Install all modules using Java 11
shell: bash
run: |
mvn -V -B -ntp clean install -DskipTests -Dfmt.skip -Dcheckstyle.skip
mvn -V -B -ntp clean install -PquickBuild -DskipTests
working-directory: sdk-platform-java
- uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -266,7 +265,7 @@ jobs:
- name: Install all modules using Java 11
shell: bash
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -340,7 +339,7 @@ jobs:
- run: mvn -version
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Showcase golden tests
working-directory: sdk-platform-java/java-showcase
Expand Down Expand Up @@ -419,7 +418,7 @@ jobs:
cache: maven
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Install showcase to local maven repository
run: |
Expand Down Expand Up @@ -457,17 +456,13 @@ jobs:
run: |
mvn install \
-B -ntp \
-PquickBuild \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-DskipTests \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Dmaven.wagon.http.retryHandler.count=5 \
-T 1C
working-directory: sdk-platform-java
working-directory: sdk-platform-java
- name: Validate gapic-generator-java-bom
uses: googleapis/java-cloud-bom/tests/validate-bom@47ad868794c5d38ee7eb95d69371a7a79f84d890
with:
Expand All @@ -492,7 +487,7 @@ jobs:
working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
mvn install -B -ntp -PquickBuild -DskipTests
working-directory: sdk-platform-java
- name: Unmanaged dependency check
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
Expand Down
29 changes: 5 additions & 24 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,9 @@ case ${JOB_TYPE} in
retry_with_backoff 3 10 \
mvn install \
-B -ntp \
-PquickBuild \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Dmaven.wagon.http.retryHandler.count=5 \
--also-make \
${SUREFIRE_JVM_OPT} "${EXTRA_PROFILE_OPTS[@]}"
Expand All @@ -80,13 +76,9 @@ case ${JOB_TYPE} in
install_modules "sdk-platform-java"
mvn install \
-B -ntp \
-PquickBuild \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Dmaven.wagon.http.retryHandler.count=5 \
-DskipTests=true \
--also-make \
Expand Down Expand Up @@ -143,19 +135,13 @@ case ${JOB_TYPE} in

echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
mvn verify -Penable-integration-tests \
mvn verify -Penable-integration-tests -PquickBuild \
--also-make \
${INTEGRATION_TEST_ARGS} \
-B -ntp -fae \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Djacoco.skip=true \
-DskipUnitTests=true \
-Dmaven.wagon.http.retryHandler.count=5 \
${SUREFIRE_JVM_OPT}
Expand Down Expand Up @@ -202,18 +188,13 @@ case ${JOB_TYPE} in
echo "Running in subdir: ${BUILD_SUBDIR}"
pushd "${BUILD_SUBDIR}"
echo "INTEGRATION_TEST_ARGS: ${INTEGRATION_TEST_ARGS}"
mvn test -Pnative \
mvn test -Pnative -PquickBuild \
--also-make \
${INTEGRATION_TEST_ARGS} \
-B -ntp -fae \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS

RETURN_CODE=$?
popd
Expand Down
31 changes: 5 additions & 26 deletions .kokoro/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -298,19 +298,13 @@ function run_integration_tests() {
parse_all_submodules "$1"
printf "Running integration tests for submodules:\n%s\n" "$all_submodules"

mvn verify -Penable-integration-tests --projects "$all_submodules" \
mvn verify -Penable-integration-tests -PquickBuild --projects "$all_submodules" \
${INTEGRATION_TEST_ARGS} \
-B -ntp -fae \
--also-make \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-Djacoco.skip=true \
-DskipUnitTests=true \
-Dmaven.wagon.http.retryHandler.count=5 \
-T 1C
Expand All @@ -324,17 +318,12 @@ function run_graalvm_tests() {
parse_all_submodules "$1"
printf "Running GraalVM ITs for submodules:\n%s\n" "$all_submodules"

mvn test -Pnative --projects "$all_submodules" \
mvn test -Pnative -PquickBuild --projects "$all_submodules" \
${INTEGRATION_TEST_ARGS} \
-B -ntp -fae \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS

RETURN_CODE=$?
printf "Finished GraalVM ITs for modules:\n%s\n" "$1"
Expand Down Expand Up @@ -399,16 +388,11 @@ function install_modules() {
if [ -z "$1" ]; then
mvn install \
-B -ntp \
-PquickBuild \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-DskipTests=true \
-Djacoco.skip=true \
-T 1C
else
printf "Installing modules:\n%s\n" "$1"
Expand Down Expand Up @@ -452,16 +436,11 @@ function install_modules() {
# Correctly builds dependencies without building dependents.
mvn install --projects "$all_submodules,$always_install_deps" --also-make \
-B -ntp \
-PquickBuild \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dorg.slf4j.simpleLogger.showDateTime=true \
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
-Dcheckstyle.skip=true \
-Dflatten.skip=true \
-Danimal.sniffer.skip=true \
-DskipTests=true \
-Djacoco.skip=true \
-T 1C
fi
}
6 changes: 2 additions & 4 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ fi
# this should run maven enforcer
retry_with_backoff 3 10 \
mvn install -B -V -ntp \
-DskipTests=true \
-Dmaven.javadoc.skip=true \
-Dclirr.skip=true
-PquickBuild -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false

mvn -B dependency:analyze -DfailOnWarning=true -Dcheckstyle.skip=true
mvn -B dependency:analyze -PquickBuild -DfailOnWarning=true -Dmdep.analyze.skip=false

if [[ -n "${BUILD_SUBDIR}" ]]
then
Expand Down
16 changes: 16 additions & 0 deletions google-cloud-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,21 @@
</licenses>

<profiles>
<profile>
<id>quickBuild</id>
<properties>
<checkstyle.skip>true</checkstyle.skip>
<enforcer.skip>true</enforcer.skip>
<jacoco.skip>true</jacoco.skip>
<clirr.skip>true</clirr.skip>
<spotbugs.skip>true</spotbugs.skip>
<pmd.skip>true</pmd.skip>
<animal.sniffer.skip>true</animal.sniffer.skip>
<fmt.skip>true</fmt.skip>
<flatten.skip>true</flatten.skip>
<mdep.analyze.skip>true</mdep.analyze.skip>
</properties>
</profile>
<profile>
<!-- Only run checkstyle plugin on Java 11+ (checkstyle artifact only supports Java 11+) -->
<id>checkstyle-tests</id>
Expand All @@ -78,6 +93,7 @@
</goals>
<configuration>
<headerLocation>${checkstyle.header.file}</headerLocation>
<skip>${checkstyle.skip}</skip>
</configuration>
</execution>
</executions>
Expand Down
Loading
Loading