diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index db954df7ca3e..3faacf5effaa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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: @@ -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: diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml index a88d45304d8e..0e6967025704 100644 --- a/.github/workflows/sdk-platform-java-ci.yaml +++ b/.github/workflows/sdk-platform-java-ci.yaml @@ -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 @@ -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: | @@ -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 @@ -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: | @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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 @@ -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: | @@ -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: @@ -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 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index b8524fbb94d8..c50b917987b5 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -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[@]}" @@ -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 \ @@ -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} @@ -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 diff --git a/.kokoro/common.sh b/.kokoro/common.sh index f9ef8af157bc..4ddf4a83d2b2 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -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 @@ -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" @@ -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" @@ -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 } diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index b273094ff7d3..947422916e96 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -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 diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml index f536829ce561..4ba90fb08b60 100644 --- a/google-cloud-pom-parent/pom.xml +++ b/google-cloud-pom-parent/pom.xml @@ -58,6 +58,21 @@ + + quickBuild + + true + true + true + true + true + true + true + true + true + true + + checkstyle-tests @@ -78,6 +93,7 @@ ${checkstyle.header.file} + ${checkstyle.skip} diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index 57b697858660..6778c89d5a65 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -77,6 +77,22 @@ + + quickBuild + + true + true + true + true + true + true + true + true + true + true + + + checkstyle-tests @@ -97,6 +113,7 @@ ${checkstyle.header.file} + ${checkstyle.skip}