Skip to content

Commit

Permalink
[antlir][c8 eol][1/n] Clean up C8 references
Browse files Browse the repository at this point in the history
Summary: chunked it up across a few diffs to make it more reviewable

Test Plan: ci

Reviewed By: vmagro

Differential Revision: D66776434

fbshipit-source-id: d916dc5e0de05d4f1422da1d645f8290f133e69b
  • Loading branch information
Naveed Golafshani authored and facebook-github-bot committed Dec 10, 2024
1 parent 737a609 commit ec40931
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
12 changes: 6 additions & 6 deletions antlir/antlir2/test_images/cfg/configured_alias/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@ oncall("antlir")
export_file(
name = "f",
src = select({
"//antlir/antlir2/os:centos8": "c8",
"//antlir/antlir2/os:centos10": "c10",
"//antlir/antlir2/os:centos9": "c9",
"DEFAULT": "default",
}),
)

antlir2_configured_alias(
name = "f.c8",
name = "f.c9",
actual = ":f",
default_os = "centos8",
default_os = "centos9",
)

antlir2_configured_alias(
name = "f.c9",
name = "f.c10",
actual = ":f",
default_os = "centos9",
default_os = "centos10",
)

python_unittest(
name = "test",
srcs = ["test.py"],
resources = {
":f": "f.default",
":f.c8": "f.centos8",
":f.c10": "f.centos10",
":f.c9": "f.centos9",
},
)
1 change: 1 addition & 0 deletions antlir/antlir2/test_images/cfg/configured_alias/c10
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
centos10
1 change: 0 additions & 1 deletion antlir/antlir2/test_images/cfg/configured_alias/c8

This file was deleted.

2 changes: 1 addition & 1 deletion antlir/antlir2/test_images/cfg/configured_alias/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ def setUp(self) -> None:
super().setUp()

def test_configured_alias(self) -> None:
for variant in ["centos8", "centos9", "default"]:
for variant in ["centos9", "centos10", "default"]:
with self.subTest(variant):
self.assertEqual(variant + "\n", read_text(__package__, "f." + variant))
12 changes: 0 additions & 12 deletions antlir/bzl/linux/tests/BUCK
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
load("//antlir/antlir2/bzl/feature:defs.bzl", "feature")
load("//antlir/antlir2/bzl/image:defs.bzl", "image")
load("//antlir/antlir2/testing:image_test.bzl", "image_python_test")
load("//antlir/bzl:build_defs.bzl", "is_facebook")
load("//antlir/bzl/linux:defs.bzl", "linux")

oncall("antlir")
Expand Down Expand Up @@ -129,14 +128,3 @@ image_python_test(
"//antlir:fs_utils",
],
)

image_python_test(
name = "test-os-release-c8",
srcs = ["test_os_release.py"],
default_os = "centos8",
env = {"CENTOS": "8"},
layer = ":test-layer-os-release",
deps = [
"//antlir:fs_utils",
],
) if is_facebook else None

0 comments on commit ec40931

Please sign in to comment.