Skip to content

Commit 5331422

Browse files
jinseopkim0jinseopkim0
committed
refactor(bigquery): create google-cloud-bigquerystorage-it to resolve circular test dependency
1 parent bfd98cf commit 5331422

2,052 files changed

Lines changed: 8492 additions & 7482 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.

‎.kokoro/common.sh‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,28 @@ function generate_modified_modules_list() {
278278
modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
279279
for module in $modules; do
280280
if [[ " ${maven_modules[*]} " =~ " ${module} " ]]; then
281-
modified_module_list+=("${module}")
281+
local duplicate=false
282+
for item in "${modified_module_list[@]}"; do
283+
if [[ "${item}" == "${module}" ]]; then
284+
duplicate=true
285+
break
286+
fi
287+
done
288+
if [[ "${duplicate}" == "false" ]]; then
289+
modified_module_list+=("${module}")
290+
fi
291+
if [[ "${module}" == "java-bigquerystorage" ]]; then
292+
local has_bigquery=false
293+
for item in "${modified_module_list[@]}"; do
294+
if [[ "${item}" == "java-bigquery" ]]; then
295+
has_bigquery=true
296+
break
297+
fi
298+
done
299+
if [[ "${has_bigquery}" == "false" ]]; then
300+
modified_module_list+=("java-bigquery")
301+
fi
302+
fi
282303
fi
283304
done
284305
else

‎.kokoro/presubmit/bigquery-graalvm-native-presubmit.cfg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ env_vars: {
3636
key: "ENABLE_FLAKYBOT"
3737
value: "false"
3838
}
39+
env_vars: {
40+
key: "INTEGRATION_TEST_ARGS"
41+
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dtest=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
42+
}
43+
3944
env_vars: {
4045
key: "BUILD_SUBDIR"
4146
value: "java-bigquery"
4247
}
4348

4449

50+

‎.kokoro/presubmit/bigquery-integration.cfg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ env_vars: {
3333
}
3434

3535

36+
env_vars: {
37+
key: "INTEGRATION_TEST_ARGS"
38+
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
39+
}
40+
3641
env_vars: {
3742
key: "BUILD_SUBDIR"
3843
value: "java-bigquery"
3944
}
4045

4146

47+

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
6767
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
6868
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6969

70-
_gapic_generator_java_version = "2.76.0-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.75.0" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

‎gapic-libraries-bom/pom.xml‎

Lines changed: 225 additions & 225 deletions
Large diffs are not rendered by default.

‎google-auth-library-java/appengine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.google.auth</groupId>
77
<artifactId>google-auth-library-parent</artifactId>
8-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
8+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎google-auth-library-java/bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.auth</groupId>
55
<artifactId>google-auth-library-bom</artifactId>
6-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
6+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-bom:current} -->
77
<packaging>pom</packaging>
88

99
<parent>
@@ -23,22 +23,22 @@
2323
<dependency>
2424
<groupId>com.google.auth</groupId>
2525
<artifactId>google-auth-library-credentials</artifactId>
26-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
26+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
2727
</dependency>
2828
<dependency>
2929
<groupId>com.google.auth</groupId>
3030
<artifactId>google-auth-library-oauth2-http</artifactId>
31-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
31+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
3232
</dependency>
3333
<dependency>
3434
<groupId>com.google.auth</groupId>
3535
<artifactId>google-auth-library-appengine</artifactId>
36-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
36+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
3737
</dependency>
3838
<dependency>
3939
<groupId>com.google.auth</groupId>
4040
<artifactId>google-auth-library-cab-token-generator</artifactId>
41-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
41+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
4242
</dependency>
4343
</dependencies>
4444
</dependencyManagement>

‎google-auth-library-java/cab-token-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.google.auth</groupId>
88
<artifactId>google-auth-library-parent</artifactId>
9-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
9+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
1010
</parent>
1111

1212
<artifactId>google-auth-library-cab-token-generator</artifactId>

‎google-auth-library-java/credentials/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.auth</groupId>
66
<artifactId>google-auth-library-parent</artifactId>
7-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
7+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

‎google-auth-library-java/oauth2_http/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.google.auth</groupId>
99
<artifactId>google-auth-library-parent</artifactId>
10-
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
10+
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

0 commit comments

Comments
 (0)