Skip to content

Commit a222493

Browse files
committed
Edit workflow
1 parent 28ba86e commit a222493

115 files changed

Lines changed: 45 additions & 5 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cloudbuild/jdbc_presubmit.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright 2026 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# Github action job to test core java library features on
15+
# downstream client libraries before they are released.
16+
options:
17+
workerPool: 'projects/bigquery-devtools-drivers/locations/us-east1/workerPools/java-bigquery-jdbc-pool'
18+
dynamic_substitutions: true
19+
logging: CLOUD_LOGGING_ONLY
20+
21+
timeout: 2000s
22+
steps:
23+
- name: 'gcr.io/cloud-devrel-public-resources/java11'
24+
id: "IT Tests"
25+
timeout: 2000s
26+
entrypoint: 'bash'
27+
args: ['-c', 'source .kokoro/common.sh && install_modules java-bigquery-jdbc && cd java-bigquery-jdbc && make integration-test test=ITBigQueryJDBCTest']
28+
secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET']
29+
availableSecrets:
30+
secretManager:
31+
- versionName: projects/$PROJECT_ID/secrets/jdbc-presubmit-sa-email/versions/latest
32+
env: 'SA_EMAIL'
33+
- versionName: projects/$PROJECT_ID/secrets/kms_resource_path/versions/latest
34+
env: 'KMS_RESOURCE_PATH'
35+
- versionName: projects/$PROJECT_ID/secrets/GoogleJDBCServiceAccountSecret/versions/latest
36+
env: 'SA_SECRET'

.kokoro/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ excluded_modules=(
2020
'java-vertexai'
2121
'java-logging'
2222
'java-bigquery'
23+
'java-bigquery-jdbc'
2324
'java-bigquerystorage'
2425
'java-datastore'
2526
'java-logging-logback'

java-bigquery/google-cloud-bigquery-jdbc/Dockerfile renamed to java-bigquery-jdbc/Dockerfile

File renamed without changes.

java-bigquery/google-cloud-bigquery-jdbc/Makefile renamed to java-bigquery-jdbc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ unittest: |
2828

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

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

java-bigquery/google-cloud-bigquery-jdbc/README.MD renamed to java-bigquery-jdbc/README.MD

java-bigquery/google-cloud-bigquery-jdbc/pom.xml renamed to java-bigquery-jdbc/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,16 @@
151151

152152
<parent>
153153
<groupId>com.google.cloud</groupId>
154-
<artifactId>google-cloud-bigquery-parent</artifactId>
155-
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
154+
<artifactId>google-cloud-jar-parent</artifactId>
155+
<version>1.81.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
156+
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
156157
</parent>
158+
157159
<dependencies>
158160
<dependency>
159161
<groupId>com.google.cloud</groupId>
160162
<artifactId>google-cloud-bigquery</artifactId>
163+
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
161164
</dependency>
162165
<dependency>
163166
<groupId>com.google.cloud</groupId>

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryConversionException.java renamed to java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryConversionException.java

File renamed without changes.

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcCoercionException.java renamed to java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcCoercionException.java

File renamed without changes.

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcCoercionNotFoundException.java renamed to java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcCoercionNotFoundException.java

File renamed without changes.

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcException.java renamed to java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcException.java

File renamed without changes.

0 commit comments

Comments
 (0)