Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
6 changes: 1 addition & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,9 @@ jobs:
run: |
mvn test \
-B -ntp \
-Pquick-build \
-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
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 -Pquick-build \
-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 -Pquick-build \
-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 -Pquick-build -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 -Pquick-build \
-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 -Pquick-build \
-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 -Pquick-build -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 -Pquick-build \
-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 -Pquick-build \
-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 -Pquick-build -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 -Pquick-build \
-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 -Pquick-build \
-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 -Pquick-build -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 -Pquick-build -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 -Pquick-build -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 -Pquick-build -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 \
-Pquick-build \
-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 -Pquick-build -DskipTests
working-directory: sdk-platform-java
- name: Unmanaged dependency check
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
# Install the modules for showcase (Shared-Deps is required to run showcase)
- name: Install sdk-platform-java's modules
# gapic-generator-java requires Java 8 and is irrelevant for this CI
run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests -Dclirr.skip -T 1C
run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Pquick-build -DskipTests -T 1C
working-directory: sdk-platform-java

# Set up local showcase server to run the showcase ITs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
cache: maven
- name: Install sdk-platform-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 -DskipTests -Pquick-build
working-directory: sdk-platform-java
- name: Check Java 8 compatibility for class files
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-platform-java-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
BUILD_SUBDIR: sdk-platform-java
JOB_TYPE: install
- name: Install
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -Dfmt.skip
run: mvn install --errors --batch-mode --no-transfer-progress -Pquick-build
working-directory: sdk-platform-java
- name: Create issue if previous step fails
if: ${{ failure() }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- run: java -version
- name: Install maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
mvn install -B -ntp -DskipTests -Pquick-build
- name: Check the BOM content satisfies the upper-bound-check test case
run: mvn -B -V -ntp verify -Dcheckstyle.skip
run: mvn -B -V -ntp verify -Pquick-build
working-directory: sdk-plaform-java/java-shared-dependencies/upper-bound-check
4 changes: 2 additions & 2 deletions .github/workflows/sdk-platform-java-sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
mvn -B verify -Dcheckstyle.skip \
mvn -B verify -Pquick-build \
-DenableFullTestCoverage \
-Penable-integration-tests \
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
Expand All @@ -84,7 +84,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
mvn -B clean verify -Dcheckstyle.skip \
mvn -B clean verify -Pquick-build \
-DskipUnitTests \
-Penable-integration-tests \
-DenableShowcaseTestCoverage \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
java-version: 11
- name: Install modules
shell: bash
run: mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
run: mvn install -B -ntp -T 1C -DskipTests -Pquick-build
- name: Unmanaged dependency check
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
with:
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 \
-Pquick-build \
-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 \
-Pquick-build \
-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 -Pquick-build \
--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 -Pquick-build \
--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 @@ -301,19 +301,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 -Pquick-build --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 @@ -327,17 +321,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 -Pquick-build --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 @@ -402,16 +391,11 @@ function install_modules() {
if [ -z "$1" ]; then
mvn install \
-B -ntp \
-Pquick-build \
-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 @@ -465,16 +449,11 @@ function install_modules() {
# Correctly builds dependencies without building dependents.
mvn install --projects "$all_submodules,$always_install_deps" --also-make \
-B -ntp \
-Pquick-build \
-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
}
Loading
Loading