commit 6e7a7d3affb79e9119fd94c55a3bee2478eba949
author Benjamin Peterson <benjamin@engflow.com> Thu Apr 20 08:01:52 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 20 08:03:21 2023 -0700
tree 1b332f6dea025f21c8a255e9d663b6277e2b3d01
parent 693ab97ed8cfb2389607f85fb99d77187eed1496

Remove JDKs from distfiles.

Fixes https://github.com/bazelbuild/bazel/issues/18050.

Closes #18147.

PiperOrigin-RevId: 525747553
Change-Id: Iaed608f9df5a5e9cec8799bff82fda305dc10606

distdir_deps.bzl

diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index 20b6634..f2531d1 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -574,7 +574,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -605,7 +604,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -623,7 +621,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -641,7 +638,6 @@
             "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",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -657,7 +653,7 @@
             "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",
         ],
-        "used_in": ["additional_distfiles"],
+        "used_in": [],
     },
     "remotejdk17_macos": {
         "aliases": [
@@ -673,7 +669,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -691,7 +686,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },
@@ -709,7 +703,6 @@
             "https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
         ],
         "used_in": [
-            "additional_distfiles",
             "test_WORKSPACE_files",
         ],
     },

src/test/shell/testenv.sh.tmpl

diff --git a/src/test/shell/testenv.sh.tmpl b/src/test/shell/testenv.sh.tmpl
index edc41b8..a50b8bf 100755
--- a/src/test/shell/testenv.sh.tmpl
+++ b/src/test/shell/testenv.sh.tmpl
@@ -276,6 +276,11 @@
         "bazel_skylib"
         "bazel_toolchains"
         "com_google_protobuf"
+        "openjdk_linux_aarch64_vanilla"
+        "openjdk_linux_vanilla"
+        "openjdk_macos_x86_64_vanilla"
+        "openjdk_macos_aarch64_vanilla"
+        "openjdk_win_vanilla"
         "openjdk11_darwin_archive"
         "openjdk11_darwin_aarch64_archive"
         "openjdk11_linux_archive"