Adapt to updated bazlets version Change-Id: I2841efa6249cc91ccedf835cdf88f59d1f1d0baa
diff --git a/BUILD b/BUILD index f6524a4..c4198d7 100644 --- a/BUILD +++ b/BUILD
@@ -1,7 +1,7 @@ load( "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", "gerrit_plugin", - "gerrit_plugin_dependency_tests", + "gerrit_plugin_ext_test_deps", "gerrit_plugin_test_util", "gerrit_plugin_tests", ) @@ -20,9 +20,9 @@ ] gerrit_plugin( - plugin = "index-opensearch", srcs = glob(["src/main/java/**/*.java"]), ext_deps = OPENSEARCH_DEPS, + plugin = "index-opensearch", deps = [ ":proto-converter-neverlink", ], @@ -39,13 +39,13 @@ gerrit_plugin_test_util( name = "opensearch_test_utils", - plugin = "index-opensearch", srcs = glob( ["src/test/java/**/*.java"], exclude = ["src/test/java/**/*Test.java"], ), + ext_deps_label = ":index-opensearch__plugin_test_deps", + plugin = "index-opensearch", visibility = ["//visibility:public"], - ext_deps = OPENSEARCH_TEST_DEPS, ) QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests" @@ -65,10 +65,10 @@ [gerrit_plugin_test_util( name = "abstract_open_query_%ss_test" % name, - plugin = "index-opensearch", srcs = glob(["src/test/java/com/google/gerrit/opensearch/" + src]), + ext_deps_label = ":index-opensearch__plugin_test_deps", + plugin = "index-opensearch", visibility = ["//visibility:public"], - ext_deps = OPENSEARCH_TEST_DEPS, deps = [ QUERY_TESTS_DEP % name, ":opensearch_test_utils", @@ -80,27 +80,25 @@ [gerrit_plugin_tests( name = "open_query_%ss_test_V3" % name, - plugin = "index-opensearch", size = "enormous", srcs = ["src/test/java/com/google/gerrit/opensearch/" + src], + ext_deps_label = ":index-opensearch__plugin_test_deps", + plugin = "index-opensearch", tags = [ "docker", "exclusive", "opensearch", "opensearch_V3", ], - ext_deps = OPENSEARCH_TEST_DEPS, deps = [ QUERY_TESTS_DEP % name, ":opensearch_test_utils", ":abstract_open_query_%ss_test" % name, ], - skip_dependency_tests = True, ) for name, src in OPENSEARCH_TESTS_V3.items()] # Small unit tests (version/config/etc.) — excludes the large query integration tests. gerrit_plugin_tests( - plugin = "index-opensearch", size = "small", srcs = glob( [ @@ -109,9 +107,15 @@ ], exclude = ["src/test/java/**/Open*Query*" + SUFFIX], ), + ext_deps_label = ":index-opensearch__plugin_test_deps", + plugin = "index-opensearch", tags = ["opensearch"], - ext_deps = OPENSEARCH_TEST_DEPS, deps = [ ":opensearch_test_utils", ], ) + +gerrit_plugin_ext_test_deps( + ext_deps = OPENSEARCH_TEST_DEPS, + plugin = "index-opensearch", +)