Skip to content

Commit 2df3374

Browse files
8Keepmeta-codesync[bot]
authored andcommitted
Remove dead fully-qualified test name rollout
Summary: This rollout was superceded by the test config unification project, which is fully rolled out to fbcode. Test Plan: CI Reviewed By: JakobDegen Differential Revision: D113988460 fbshipit-source-id: f05e04031b9efee9906754536849e44ce2c9768b
1 parent d79b790 commit 2df3374

5 files changed

Lines changed: 1 addition & 21 deletions

File tree

antlir/antlir2/antlir2_vm/bzl/test.bzl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# This source code is licensed under the MIT license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
# @oss-disable[end= ]: load("@fbcode_macros//build_defs:fully_qualified_test_name_rollout.bzl", "NAMING_ROLLOUT_LABEL", "fully_qualified_test_name_rollout")
76
# @oss-disable[end= ]: load("@fbsource//tools/build_defs:testpilot_defs.bzl", "tpx_labels")
87
# @oss-disable[end= ]: load("@fbsource//tools/target_determinator/macros:ci.bzl", "ci")
98
load("@prelude//utils:selects.bzl", "selects")
@@ -12,7 +11,7 @@ load("//antlir/antlir2/testing:image_test.bzl", "HIDE_TEST_LABELS", "env_from_wr
1211
load("//antlir/buck2/bzl:ensure_single_output.bzl", "ensure_single_output")
1312
load("//antlir/bzl:build_defs.bzl", "add_test_framework_label", "buck_sh_test", "cpp_unittest", "python_unittest", "rust_unittest")
1413
# @oss-disable[end= ]: load(":disable_dev_mode.bzl", "disable_dev_mode")
15-
load("//antlir/bzl:oss_shim.bzl", "NAMING_ROLLOUT_LABEL", "tpx_labels", "fully_qualified_test_name_rollout") # @oss-enable
14+
load("//antlir/bzl:oss_shim.bzl", "tpx_labels") # @oss-enable
1615
load(":types.bzl", "VMHostInfo")
1716

1817
def _impl(ctx: AnalysisContext) -> list[Provider]:
@@ -229,8 +228,6 @@ def _get_internal_labels(test_rule, run_as_bundle: bool) -> (list[str], list[str
229228
wrapper_labels = ["heavyweight"]
230229
if run_as_bundle:
231230
wrapper_labels.append(tpx_labels.run_as_bundle)
232-
if fully_qualified_test_name_rollout.use_fully_qualified_name():
233-
wrapper_labels = wrapper_labels + [NAMING_ROLLOUT_LABEL]
234231
wrapper_labels.append(tpx_labels.enable_artifact_reporting)
235232

236233
inner_labels = add_test_framework_label(HIDE_TEST_LABELS, "test-framework=8:vmtest")

antlir/antlir2/testing/image_test.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# This source code is licensed under the MIT license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
# @oss-disable[end= ]: load("@fbcode_macros//build_defs:fully_qualified_test_name_rollout.bzl", "NAMING_ROLLOUT_LABEL", "fully_qualified_test_name_rollout")
76
# @oss-disable[end= ]: load("@fbsource//tools/build_defs:testpilot_defs.bzl", "tpx_labels")
87
# @oss-disable[end= ]: load("@fbsource//tools/target_determinator/macros:ci.bzl", "ci")
98
load("@prelude//utils:selects.bzl", "selects")
@@ -315,9 +314,6 @@ def _implicit_image_test(
315314
lambda labels: labels + _add_outer_labels,
316315
)
317316

318-
# @oss-disable[end= ]: if fully_qualified_test_name_rollout.use_fully_qualified_name():
319-
# @oss-disable[end= ]: labels = labels + [NAMING_ROLLOUT_LABEL]
320-
321317
if rootless == None:
322318
rootless = get_antlir2_rootless()
323319

antlir/antlir2/testing/test_that_should_fail.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# This source code is licensed under the MIT license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
# @oss-disable[end= ]: load("@fbcode_macros//build_defs:fully_qualified_test_name_rollout.bzl", "NAMING_ROLLOUT_LABEL", "fully_qualified_test_name_rollout")
76
# @oss-disable[end= ]: load("@fbsource//tools/build_defs:testpilot_defs.bzl", "tpx_labels")
87
load("//antlir/antlir2/bzl:platform.bzl", "default_target_platform_kwargs")
98
load("//antlir/bzl:build_defs.bzl", "buck_sh_test", "cpp_unittest", "python_unittest", "rust_unittest")
@@ -68,9 +67,6 @@ def test_that_should_fail(test_rule, name: str, stdout_re: str | None = None, st
6867
test_rule(name = name + "_failing_inner_test", labels = _HIDE_TEST_LABELS, **kwargs)
6968
labels = list(labels) if labels else []
7069

71-
# @oss-disable[end= ]: if fully_qualified_test_name_rollout.use_fully_qualified_name():
72-
# @oss-disable[end= ]: labels = labels + [NAMING_ROLLOUT_LABEL]
73-
7470
_test_that_should_fail(
7571
name = name,
7672
test = ":" + name + "_failing_inner_test",

antlir/bzl/oss_shim.bzl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ special_tags = struct(
3131
test_is_invisible_to_testpilot = "OSS_NO_OP",
3232
)
3333

34-
fully_qualified_test_name_rollout = struct(
35-
use_fully_qualified_name = lambda: False,
36-
)
37-
38-
NAMING_ROLLOUT_LABEL = "OSS_NO_OP"
39-
4034
rollout = struct(
4135
check_base_path = ret_false,
4236
create_feature = ret_false,

antlir/util/testing/snapshot_test/snapshot_test.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# This source code is licensed under the MIT license found in the
44
# LICENSE file in the root directory of this source tree.
55

6-
# @oss-disable[end= ]: load("@fbcode_macros//build_defs:fully_qualified_test_name_rollout.bzl", "NAMING_ROLLOUT_LABEL", "fully_qualified_test_name_rollout")
76
load("@prelude//:paths.bzl", "paths")
87

98
def _dir_snapshot_test_impl(ctx: AnalysisContext) -> list[Provider]:
@@ -52,8 +51,6 @@ _dir_snapshot_test = rule(
5251

5352
def dir_snapshot_test(**kwargs):
5453
labels = kwargs.get("labels", [])
55-
# @oss-disable[end= ]: if fully_qualified_test_name_rollout.use_fully_qualified_name():
56-
# @oss-disable[end= ]: labels = labels + [NAMING_ROLLOUT_LABEL]
5754

5855
return _dir_snapshot_test(
5956
name = kwargs.get("name"),

0 commit comments

Comments
 (0)