Skip to content

chore(bq jdbc): BQ JDBC presubmit #12062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
logachev wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −22
Draft

chore(bq jdbc): BQ JDBC presubmit #12062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 1 addition & 17 deletions java-bigquery/.cloudbuild/jdbc_nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,8 @@ steps:
id: "IT Tests"
timeout: 10000s
entrypoint: 'bash'
args: ['.kokoro/build.sh']
env:
- 'JOB_TYPE=jdbc-integration'
args: ['java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh']
secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET']
- name: 'gcr.io/cloud-devrel-public-resources/java11'
id: "IT Nightly Tests"
timeout: 10000s
entrypoint: 'bash'
args: ['.kokoro/build.sh']
env:
- 'JOB_TYPE=jdbc-nightly-integration'
- name: 'gcr.io/cloud-devrel-public-resources/java11'
id: "Nightly build"
timeout: 10000s
entrypoint: 'bash'
args: ['.kokoro/jdbc-release.sh']
env:
- 'NIGHTLY_RELEASE_GCS_BUCKET=$_NIGHTLY_RELEASE_GCS_BUCKET'

availableSecrets:
secretManager:
Expand Down
4 changes: 1 addition & 3 deletions java-bigquery/.cloudbuild/jdbc_presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ steps:
id: "IT Tests"
timeout: 2000s
entrypoint: 'bash'
args: ['.kokoro/build.sh']
env:
- 'JOB_TYPE=${_JOB_TYPE}'
args: ['java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh']
secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET']
availableSecrets:
secretManager:
Expand Down
9 changes: 9 additions & 0 deletions java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ROOT_FOLDER=$(git rev-parse --show-toplevel)

cd ${ROOT_FOLDER}
source .kokoro/common.sh
install_modules java-bigquery

cd ${ROOT_FOLDER}/java-bigquery/google-cloud-bigquery-jdbc
make integration-test test=ITBigQueryJDBCTest
make integration-test test=ITNightlyBigQueryTest
8 changes: 8 additions & 0 deletions java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ROOT_FOLDER=$(git rev-parse --show-toplevel)

cd ${ROOT_FOLDER}
source .kokoro/common.sh
install_modules java-bigquery

cd ${ROOT_FOLDER}/java-bigquery/google-cloud-bigquery-jdbc
make integration-test test=ITBigQueryJDBCTest
4 changes: 2 additions & 2 deletions java-bigquery/google-cloud-bigquery-jdbc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ unittest: |

# Important: By default, this command will skip unittests.
# To include unit tests, run: make integration-test skipSurefire=false
integration-test: .check-env
integration-test:
mvn -B -ntp \
-Penable-integration-tests \
-DtrimStackTrace=false \
Expand All @@ -45,7 +45,7 @@ unit-test-coverage:
BUILD_DIR=$$(mvn -B -ntp help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \
cd $$BUILD_DIR/site && zip -r $$OLDPWD/jacoco-unittests.zip jacoco && cd $$OLDPWD

full-coverage: .check-env
full-coverage:
$(MAKE) integration-test skipSurefire=false test=ITBigQueryJDBCTest,ITNightlyBigQueryTest
mvn -B -ntp jacoco:report
BUILD_DIR=$$(mvn -B -ntp help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \
Expand Down
Loading