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
23 changes: 22 additions & 1 deletion .kokoro/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,28 @@ function generate_modified_modules_list() {
modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
for module in $modules; do
if [[ " ${maven_modules[*]} " =~ " ${module} " ]]; then
modified_module_list+=("${module}")
local duplicate=false
for item in "${modified_module_list[@]}"; do
if [[ "${item}" == "${module}" ]]; then
duplicate=true
break
fi
done
if [[ "${duplicate}" == "false" ]]; then
modified_module_list+=("${module}")
fi
if [[ "${module}" == "java-bigquerystorage" ]]; then
local has_bigquery=false
for item in "${modified_module_list[@]}"; do
if [[ "${item}" == "java-bigquery" ]]; then
has_bigquery=true
break
fi
done
if [[ "${has_bigquery}" == "false" ]]; then
modified_module_list+=("java-bigquery")
fi
fi
Comment thread
jinseopkim0 marked this conversation as resolved.
fi
done
else
Expand Down
6 changes: 6 additions & 0 deletions .kokoro/presubmit/bigquery-graalvm-native-presubmit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ env_vars: {
key: "ENABLE_FLAKYBOT"
value: "false"
}
env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
}

env_vars: {
key: "BUILD_SUBDIR"
value: "java-bigquery"
}



6 changes: 6 additions & 0 deletions .kokoro/presubmit/bigquery-integration.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,15 @@ env_vars: {
}


env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
}

env_vars: {
key: "BUILD_SUBDIR"
value: "java-bigquery"
}



50 changes: 50 additions & 0 deletions java-bigquery/google-cloud-bigquery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@
<artifactId>google-cloud-bigquerystorage</artifactId>
<version>3.31.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquerystorage</artifactId>
<version>3.31.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
Expand Down Expand Up @@ -225,6 +232,49 @@
<artifactId>opentelemetry-sdk-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.4</version>
<scope>test</scope>
</dependency>
Comment thread
jinseopkim0 marked this conversation as resolved.
Comment thread
jinseopkim0 marked this conversation as resolved.
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigquerystorage-v1beta1</artifactId>
<scope>test</scope>
<version>3.31.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigquerystorage-v1beta2</artifactId>
<scope>test</scope>
<version>3.31.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1beta2:current} -->
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
9 changes: 5 additions & 4 deletions java-bigquerystorage/google-cloud-bigquerystorage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,16 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
Expand Down
13 changes: 1 addition & 12 deletions java-bigquerystorage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,7 @@
<artifactId>google-cloud-bigquerystorage</artifactId>
<version>3.31.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>2.57.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquerystorage</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- {x-generated-dependencies-end} -->

</dependencies>
Expand Down
Loading