Skip to content
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

Jump to bottom

Upgrade embedded JDK to version 19/20. #18478

Closed
wants to merge 10 commits into from
Closed

Upgrade embedded JDK to version 19/20. #18478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0a0d92
Upgrade embedded JDK to version 20.
zhengwei143 May 23, 2023
e46479a
Tentatively upgrade io.netty to 4.1.93 for testing.
zhengwei143 May 25, 2023
6e59d0f
Use jdk20 for other os platforms.
zhengwei143 May 26, 2023
6ac0f28
Merge remote-tracking branch 'upstream/master' into jdk20
zhengwei143 Jun 14, 2023
dbede2b
Update embedded jdk20 binaries to jdk20.0.1 (missing for win_arm64, l…
zhengwei143 Jun 14, 2023
8506cb1
Finalize JDK versions for the different platforms.
zhengwei143 Jun 15, 2023
54eefee
Bump minimal JDK size to 350MB (due to macos - see https://buildkite.…
zhengwei143 Jun 15, 2023
7a4552b
Add --experimental_use_semaphore_for_jobs to bazel_test_test#test_run…
zhengwei143 Jun 15, 2023
43a56a6
Fix mirror urls.
zhengwei143 Jun 16, 2023
cf71222
Revert previous changes to mirror urls, they are already normalized a…
zhengwei143 Jun 16, 2023
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
82 changes: 42 additions & 40 deletions distdir_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,88 +391,90 @@ DIST_DEPS = {
"package_version": "2.6",
},
"openjdk_linux_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
"sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
"archive": "zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
"sha256": "ec5c0426a0eb2b0460968a044665ed4603b224acd5e20c379e9d7890511da683",
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_x64.tar.gz",
],
"used_in": [
],
},
"openjdk_linux_aarch64_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
"sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64",
"archive": "zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
"sha256": "2487cf315d1f56291c1f41fb56a34a7f863ce5bf85cadd284c79ea3f848d707c",
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-linux_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-linux_aarch64.tar.gz",
],
"used_in": [
],
},
# JDK20 unavailable so use JDK19 instead for linux s390x.
"openjdk_linux_s390x_vanilla": {
"archive": "OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
"sha256": "fdc82f4b06c880762503b0cb40e25f46cf8190d06011b3b768f4091d3334ef7f",
"strip_prefix": "jdk-17.0.4.1+1",
"archive": "OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
"sha256": "f2512f9a8e9847dd5d3557c39b485a8e7a1ef37b601dcbcb748d22e49f44815c",
"strip_prefix": "jdk-19.0.2+7",
"urls": [
"https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
"https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.4.1_1.tar.gz",
"https://mirror.bazel.build/github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
"https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz",
],
"used_in": [
],
},
"openjdk_linux_ppc64le_vanilla": {
"archive": "OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
"sha256": "cbedd0a1428b3058d156e99e8e9bc8769e0d633736d6776a4c4d9136648f2fd1",
"strip_prefix": "jdk-17.0.4.1+1",
"archive": "OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
"sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded",
"strip_prefix": "jdk-20+36",
"urls": [
"https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
"https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz",
"https://mirror.bazel.build/github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
"https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz",
],
"used_in": [],
},
"openjdk_macos_x86_64_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
"sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
"archive": "zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
"sha256": "befee9db92345d5146945061b721d3a6c6e182471c1536f87dbadfd5aab0e241",
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-macosx_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_x64.tar.gz",
],
"used_in": [
],
},
"openjdk_macos_aarch64_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
"sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
"archive": "zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
"sha256": "01e59f0160d051524bb16d865652d25d00a85390581737a8f35f89057c80892d",
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-macosx_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-macosx_aarch64.tar.gz",
],
"used_in": [
],
},
"openjdk_win_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
"sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
"archive": "zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
"sha256": "8a97ee11da578292f7c9e772f3edd3f083fa4f34f47a98e3abefb625ab2225ba",
"strip_prefix": "zulu20.30.11-ca-jdk20.0.1-win_x64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
"https://cdn.azul.com/zulu/bin/zulu20.30.11-ca-jdk20.0.1-win_x64.zip",
],
"used_in": [
],
},
# JDK20 unavailable so use JDK19 instead for win aarch64.
"openjdk_win_arm64_vanilla": {
"archive": "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
"archive": "zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
"sha256": "e73e851638066c48421a60e01ce7d956c1de0935620e1b66d8bbbd6cdd4f815e",
"strip_prefix": "zulu19.28.81-ca-jdk19.0.0-win_aarch64",
"urls": [
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
"https://cdn.azul.com/zulu/bin/zulu19.28.81-ca-jdk19.0.0-win_aarch64.zip",
],
"used_in": [
],
Expand Down
7 changes: 5 additions & 2 deletions src/test/shell/bazel/bazel_test_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,11 @@ EOF
cat <<EOF > BUILD
sh_test(name = "test$i", srcs = [ "test$i.sh" ])
EOF
bazel test --spawn_strategy=standalone --jobs=1 \
--runs_per_test=5 --runs_per_test_detects_flakes \
bazel test --spawn_strategy=standalone \
--jobs=1 \
--experimental_use_semaphore_for_jobs \
--runs_per_test=5 \
--runs_per_test_detects_flakes \
//:test$i &> $TEST_log || fail "should have succeeded"
expect_log "FLAKY"
done
Expand Down
6 changes: 3 additions & 3 deletions src/test/shell/integration/minimal_jdk_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ export BAZEL_SUFFIX="_jdk_minimal"
source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }

# Bazel's install base is < 345MB with minimal JDK and > 342MB with an all
# Bazel's install base is < 350MB with minimal JDK and > 350MB with an all
# modules JDK.
function test_size_less_than_345MB() {
function test_size_less_than_350MB() {
bazel info
ib=$(bazel info install_base)
size=$(du -s "$ib" | cut -d\ -f1)
maxsize=$((1024*345))
maxsize=$((1024*350))
if [ $size -gt $maxsize ]; then
echo "$ib was too big:" 1>&2
du -a "$ib" 1>&2
Expand Down