Fetch test_repos in the old way

bazelbuild · Sep 7, 2023 · e070a9b · e070a9b
1 parent daa6e36
commit e070a9b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 291 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -17,8 +17,8 @@ tasks:
       - "//scripts/packages:with-jdk/install.sh"
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-linux"
       # Override REMOTE_NETWORK_ADDRESS since bazel_sandboxing_networking_test doesn't work on this platform
@@ -68,8 +68,8 @@ tasks:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-linux"
       - "--test_tag_filters=-no_1804"
@@ -116,8 +116,8 @@ tasks:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-linux"
       - "--test_tag_filters=-no_1804"
@@ -140,8 +140,8 @@ tasks:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-linux"
     test_targets:
@@ -183,8 +183,8 @@ tasks:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-macos"
       # Fine tune the number of test jobs running in parallel to avoid timeout
@@ -248,8 +248,8 @@ tasks:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-macos"
     test_targets:
@@ -354,8 +354,8 @@ tasks:
     build_targets:
       - "//src:bazel.exe"
       - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
       - "//src/main/java/..."
-      - "@test_repos//:srcs"
     test_flags:
       - "--config=ci-windows"
     test_targets:

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -273,9 +273,6 @@ use_repo(
     "bazelci_rules",
 )
 
-test_repo_extension = use_extension("//:extensions.bzl", "test_repo_extension")
-use_repo(test_repo_extension, "test_repos")
-
 bazel_rbe_deps = use_extension("//:rbe_extension.bzl", "bazel_rbe_deps")
 use_repo(bazel_rbe_deps, "rbe_ubuntu1804_java11")