Skip to content

Commit 9bc3b20

Browse files
philwoCopybara-Service
philwo
authored and
Copybara-Service
committed
Fix the "nojava" platform and enable full presubmit checks for the various JDK platforms now that we have enough GCE resources.
This makes sure that our presubmit tests are mostly identical with the postsubmit tests again, reducing the risk of rollbacks. PiperOrigin-RevId: 215384620
1 parent 55bf5f5 commit 9bc3b20

File tree

2 files changed

+152
-1
lines changed

2 files changed

+152
-1
lines changed

‎.bazelci/postsubmit.yml

+33-1
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@ platforms:
5252
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
5353
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
5454
ubuntu1804_nojava:
55+
build_flags:
56+
- "--javabase=@openjdk_linux_archive//:runtime"
5557
build_targets:
56-
- "//examples/cpp:all"
58+
- "//src:bazel"
5759
test_flags:
60+
- "--javabase=@openjdk_linux_archive//:runtime"
5861
- "--test_timeout=1200"
5962
test_targets:
6063
- "--"
@@ -65,8 +68,37 @@ platforms:
6568
- "-//src/test/java/com/google/devtools/build/android/..."
6669
- "-//src/test/shell/bazel/android/..."
6770
# Currently broken tests on this platform.
71+
# These tests do not work without an installed system JDK:
72+
# (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
73+
# TODO(philwo): Use tags instead of an explicit blacklist.
74+
- "-//src/test/py/bazel:launcher_test"
75+
- "-//src/test/py/bazel:runfiles_test"
6876
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
77+
- "-//src/test/shell/bazel:bazel_coverage_test"
78+
- "-//src/test/shell/bazel:bazel_determinism_test"
79+
- "-//src/test/shell/bazel:bazel_example_test"
6980
- "-//src/test/shell/bazel:bazel_java_test"
81+
- "-//src/test/shell/bazel:bazel_random_characters_test"
82+
- "-//src/test/shell/bazel:bazel_repository_cache_test"
83+
- "-//src/test/shell/bazel:bazel_rules_test"
84+
- "-//src/test/shell/bazel:bazel_sandboxing_test"
85+
- "-//src/test/shell/bazel:bazel_test_test"
86+
- "-//src/test/shell/bazel:empty_package_test"
87+
- "-//src/test/shell/bazel:external_integration_test"
88+
- "-//src/test/shell/bazel:java_launcher_test"
89+
- "-//src/test/shell/bazel:local_repository_test"
90+
- "-//src/test/shell/bazel:maven_test"
91+
- "-//src/test/shell/bazel:runfiles_test"
92+
- "-//src/test/shell/integration:bazel_java_test"
93+
- "-//src/test/shell/integration:bazel_sandboxed_worker_test"
94+
- "-//src/test/shell/integration:bazel_worker_test"
95+
- "-//src/test/shell/integration:discard_analysis_cache_test"
96+
- "-//src/test/shell/integration:discard_graph_edges_test"
97+
- "-//src/test/shell/integration:java_integration_test"
98+
- "-//src/test/shell/integration:nonincremental_builds_test"
99+
- "-//src/test/shell/integration:output_filter_test"
100+
- "-//src/test/shell/integration:stub_finds_runfiles_test"
101+
- "-//src/test/shell/integration:test_test"
70102
ubuntu1804_java9:
71103
shell_commands:
72104
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#

‎.bazelci/presubmit.yml

+119
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,47 @@
11
---
22
platforms:
33
ubuntu1404:
4+
shell_commands:
5+
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
6+
android_ndk_repository/android_ndk_repository/' WORKSPACE
7+
- rm -f WORKSPACE.bak
48
build_targets:
59
- "//src:bazel"
10+
test_flags:
11+
- "--test_timeout=1200"
12+
test_targets:
13+
- "--"
14+
- "//scripts/..."
15+
- "//src/test/..."
16+
- "//third_party/ijar/..."
17+
- "//tools/android/..."
18+
# Disable Slow Tests
19+
- "-//src/test/shell/bazel:bazel_determinism_test"
20+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
21+
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
22+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
23+
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
624
ubuntu1604:
25+
shell_commands:
26+
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
27+
android_ndk_repository/android_ndk_repository/' WORKSPACE
28+
- rm -f WORKSPACE.bak
729
build_targets:
830
- "//src:bazel"
31+
test_flags:
32+
- "--test_timeout=1200"
33+
test_targets:
34+
- "--"
35+
- "//scripts/..."
36+
- "//src/test/..."
37+
- "//third_party/ijar/..."
38+
- "//tools/android/..."
39+
# Disable Slow Tests
40+
- "-//src/test/shell/bazel:bazel_determinism_test"
41+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
42+
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
43+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
44+
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
945
ubuntu1804:
1046
shell_commands:
1147
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -28,14 +64,97 @@ platforms:
2864
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
2965
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
3066
ubuntu1804_nojava:
67+
build_flags:
68+
- "--javabase=@openjdk_linux_archive//:runtime"
3169
build_targets:
3270
- "//src:bazel"
71+
test_flags:
72+
- "--javabase=@openjdk_linux_archive//:runtime"
73+
- "--test_timeout=1200"
74+
test_targets:
75+
- "--"
76+
- "//scripts/..."
77+
- "//src/test/..."
78+
- "//third_party/ijar/..."
79+
# Disable Slow Tests
80+
- "-//src/test/shell/bazel:bazel_determinism_test"
81+
# We can't run Android tests without an installed Android SDK / NDK.
82+
- "-//src/test/java/com/google/devtools/build/android/..."
83+
- "-//src/test/shell/bazel/android/..."
84+
# Currently broken tests on this platform.
85+
# These tests do not work without an installed system JDK:
86+
# (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
87+
# TODO(philwo): Use tags instead of an explicit blacklist.
88+
- "-//src/test/py/bazel:launcher_test"
89+
- "-//src/test/py/bazel:runfiles_test"
90+
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
91+
- "-//src/test/shell/bazel:bazel_coverage_test"
92+
- "-//src/test/shell/bazel:bazel_determinism_test"
93+
- "-//src/test/shell/bazel:bazel_example_test"
94+
- "-//src/test/shell/bazel:bazel_java_test"
95+
- "-//src/test/shell/bazel:bazel_random_characters_test"
96+
- "-//src/test/shell/bazel:bazel_repository_cache_test"
97+
- "-//src/test/shell/bazel:bazel_rules_test"
98+
- "-//src/test/shell/bazel:bazel_sandboxing_test"
99+
- "-//src/test/shell/bazel:bazel_test_test"
100+
- "-//src/test/shell/bazel:empty_package_test"
101+
- "-//src/test/shell/bazel:external_integration_test"
102+
- "-//src/test/shell/bazel:java_launcher_test"
103+
- "-//src/test/shell/bazel:local_repository_test"
104+
- "-//src/test/shell/bazel:maven_test"
105+
- "-//src/test/shell/bazel:runfiles_test"
106+
- "-//src/test/shell/integration:bazel_java_test"
107+
- "-//src/test/shell/integration:bazel_sandboxed_worker_test"
108+
- "-//src/test/shell/integration:bazel_worker_test"
109+
- "-//src/test/shell/integration:discard_analysis_cache_test"
110+
- "-//src/test/shell/integration:discard_graph_edges_test"
111+
- "-//src/test/shell/integration:java_integration_test"
112+
- "-//src/test/shell/integration:nonincremental_builds_test"
113+
- "-//src/test/shell/integration:output_filter_test"
114+
- "-//src/test/shell/integration:stub_finds_runfiles_test"
115+
- "-//src/test/shell/integration:test_test"
33116
ubuntu1804_java9:
117+
shell_commands:
118+
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
119+
android_ndk_repository/android_ndk_repository/' WORKSPACE
120+
- rm -f WORKSPACE.bak
34121
build_targets:
35122
- "//src:bazel"
123+
test_flags:
124+
- "--test_timeout=1200"
125+
test_targets:
126+
- "--"
127+
- "//scripts/..."
128+
- "//src/test/..."
129+
- "//third_party/ijar/..."
130+
- "//tools/android/..."
131+
# Disable Slow Tests
132+
- "-//src/test/shell/bazel:bazel_determinism_test"
133+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
134+
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
135+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
136+
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
36137
ubuntu1804_java10:
138+
shell_commands:
139+
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
140+
android_ndk_repository/android_ndk_repository/' WORKSPACE
141+
- rm -f WORKSPACE.bak
37142
build_targets:
38143
- "//src:bazel"
144+
test_flags:
145+
- "--test_timeout=1200"
146+
test_targets:
147+
- "--"
148+
- "//scripts/..."
149+
- "//src/test/..."
150+
- "//third_party/ijar/..."
151+
- "//tools/android/..."
152+
# Disable Slow Tests
153+
- "-//src/test/shell/bazel:bazel_determinism_test"
154+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
155+
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
156+
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
157+
- "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
39158
macos:
40159
shell_commands:
41160
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#

0 commit comments

Comments
 (0)