From 49e2e6efc4a745f3584f00a80fbb3b92e1cf0b36 Mon Sep 17 00:00:00 2001 From: tomsht01 Date: Tue, 17 Dec 2024 12:17:33 +0200 Subject: [PATCH] refactor: move 'constraint'/'platform' into 'labgrid' --- e2e/localhost/BUILD.bazel | 18 +++++++++--------- e2e/qemu/BUILD.bazel | 4 ++-- labgrid/config/rule.bzl | 4 ++-- .../constraint}/device/BUILD.bazel | 0 {platform => labgrid/platform}/BUILD.bazel | 4 ++-- labgrid/toolchain/config/localhost/BUILD.bazel | 2 +- .../toolchain/config/qemu/amd64/BUILD.bazel | 2 +- .../toolchain/config/qemu/arm64/BUILD.bazel | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename {constraint => labgrid/constraint}/device/BUILD.bazel (100%) rename {platform => labgrid/platform}/BUILD.bazel (79%) diff --git a/e2e/localhost/BUILD.bazel b/e2e/localhost/BUILD.bazel index f739ea8c..6d451f3a 100644 --- a/e2e/localhost/BUILD.bazel +++ b/e2e/localhost/BUILD.bazel @@ -10,7 +10,7 @@ labgrid_run( srcs = ["@ape//ape:echo"], outs = ["run.actual"], cmd = "$(location @ape//ape:echo) world > $@", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", ) py_binary( @@ -24,7 +24,7 @@ labgrid_run( srcs = [":echo-with-runfiles"], outs = ["run-with-runfiles.actual"], cmd = "$(locations :echo-with-runfiles) world > $@", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", ) labgrid_genrule( @@ -33,7 +33,7 @@ labgrid_genrule( srcs = ["@ape//ape:bash"], outs = ["run-and-transfer-file-back.actual"], cmd = "$(location @rules_labgrid//labgrid/run) --get output.txt:$@ $(location @ape//ape:bash) -c 'echo world > output.txt'", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tools = ["@rules_labgrid//labgrid/run"], ) @@ -43,7 +43,7 @@ labgrid_genrule( srcs = ["@ape//ape:bash"], outs = ["run-and-transfer-to-ruledir.actual"], cmd = "$(location @rules_labgrid//labgrid/run) --get output.txt:$(RULEDIR)/run-and-transfer-to-ruledir.actual $(location @ape//ape:bash) -c 'echo world > output.txt'", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tools = ["@rules_labgrid//labgrid/run"], ) @@ -53,7 +53,7 @@ labgrid_genrule( srcs = ["@ape//ape:bash"], outs = ["run-and-transfer-to-d.actual"], cmd = "$(location @rules_labgrid//labgrid/run) --get output.txt:$D/run-and-transfer-to-d.actual $(location @ape//ape:bash) -c 'echo world > output.txt'", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tools = ["@rules_labgrid//labgrid/run"], ) @@ -63,7 +63,7 @@ labgrid_genrule( srcs = ["@ape//ape:bash"], outs = ["nested/run-and-transfer-to-d.actual"], cmd = "$(location @rules_labgrid//labgrid/run) --get output.txt:$D/run-and-transfer-to-d.actual $(location @ape//ape:bash) -c 'echo world > output.txt'", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tools = ["@rules_labgrid//labgrid/run"], ) @@ -77,7 +77,7 @@ labgrid_genrule( srcs = ["@ape//ape:printenv"], outs = ["run-with-env.actual"], cmd = "$(location @rules_labgrid//labgrid/run) --env HELLO=world -- $(location @ape//ape:printenv) HELLO > $@", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tools = ["@rules_labgrid//labgrid/run"], ) @@ -92,7 +92,7 @@ labgrid_run_binary( "-c", "echo world > output.txt", ], - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", tool = "@rules_labgrid//labgrid/run", ) @@ -126,5 +126,5 @@ py_binary( labgrid_test( name = "test", src = ":inner", - platform = "@rules_labgrid//platform:localhost", + platform = "@rules_labgrid//labgrid/platform:localhost", ) diff --git a/e2e/qemu/BUILD.bazel b/e2e/qemu/BUILD.bazel index ae997e98..e763df2b 100644 --- a/e2e/qemu/BUILD.bazel +++ b/e2e/qemu/BUILD.bazel @@ -11,7 +11,7 @@ CPUS = ("amd64",) srcs = ["@ape//ape:cat"], outs = ["stdout-{}.log".format(cpu)], cmd = "$(location @ape//ape:cat) /etc/os-release > $@", - platform = "@rules_labgrid//platform:qemu-{}-linux".format(cpu), + platform = "@rules_labgrid//labgrid/platform:qemu-{}-linux".format(cpu), ) for cpu in CPUS ] @@ -44,7 +44,7 @@ py_binary( name = "test-{}".format(cpu), size = "large", src = ":inner", - platform = "@rules_labgrid//platform:qemu-{}-linux".format(cpu), + platform = "@rules_labgrid//labgrid/platform:qemu-{}-linux".format(cpu), ) for cpu in CPUS ] diff --git a/labgrid/config/rule.bzl b/labgrid/config/rule.bzl index c998e0a7..1cffe630 100644 --- a/labgrid/config/rule.bzl +++ b/labgrid/config/rule.bzl @@ -20,7 +20,7 @@ labgrid_config( toolchain( name = "docker", - target_compatible_with = ["//constraint:docker"], + target_compatible_with = ["//labgrid/constraint:docker"], toolchain = ":config", toolchain_type = "@rules_labgrid//labgrid/toolchain/config:type", ) @@ -44,7 +44,7 @@ labgrid_genrule( name = "gen", cmd = "$(location :example)", tools = [":example"], - platform = "//platform:docker", + platform = "///labgrid/platform:docker", ) ``` diff --git a/constraint/device/BUILD.bazel b/labgrid/constraint/device/BUILD.bazel similarity index 100% rename from constraint/device/BUILD.bazel rename to labgrid/constraint/device/BUILD.bazel diff --git a/platform/BUILD.bazel b/labgrid/platform/BUILD.bazel similarity index 79% rename from platform/BUILD.bazel rename to labgrid/platform/BUILD.bazel index 1a3f721d..e8a3d521 100644 --- a/platform/BUILD.bazel +++ b/labgrid/platform/BUILD.bazel @@ -1,6 +1,6 @@ platform( name = "localhost", - constraint_values = ["//constraint/device:localhost"], + constraint_values = ["//labgrid/constraint/device:localhost"], parents = ["@local_config_platform//:host"], visibility = ["//visibility:public"], ) @@ -9,7 +9,7 @@ platform( platform( name = "qemu-{}-linux".format(cpu), constraint_values = [ - "@rules_labgrid//constraint/device:qemu", + "//labgrid/constraint/device:qemu", "@toolchain_utils//toolchain/constraint/os:linux", "@toolchain_utils//toolchain/constraint/cpu:{}".format(cpu), ], diff --git a/labgrid/toolchain/config/localhost/BUILD.bazel b/labgrid/toolchain/config/localhost/BUILD.bazel index b42a2926..8cf578d1 100644 --- a/labgrid/toolchain/config/localhost/BUILD.bazel +++ b/labgrid/toolchain/config/localhost/BUILD.bazel @@ -11,7 +11,7 @@ labgrid_config_toolchain( src = "config.yaml", state = ":state", target_compatible_with = [ - "//constraint/device:localhost", + "//labgrid/constraint/device:localhost", ], deps = [ "//bazel/labgrid/driver", diff --git a/labgrid/toolchain/config/qemu/amd64/BUILD.bazel b/labgrid/toolchain/config/qemu/amd64/BUILD.bazel index a8d1b7e9..31ad6cd4 100644 --- a/labgrid/toolchain/config/qemu/amd64/BUILD.bazel +++ b/labgrid/toolchain/config/qemu/amd64/BUILD.bazel @@ -15,7 +15,7 @@ labgrid_config_toolchain( "LG_OPENSSH_SCP": "$(location @openssh//:scp)", }, target_compatible_with = [ - "//constraint/device:qemu", + "//labgrid/constraint/device:qemu", "@toolchain_utils//toolchain/constraint/os:linux", "@toolchain_utils//toolchain/constraint/cpu:amd64", ], diff --git a/labgrid/toolchain/config/qemu/arm64/BUILD.bazel b/labgrid/toolchain/config/qemu/arm64/BUILD.bazel index cc4099fd..82f25d64 100644 --- a/labgrid/toolchain/config/qemu/arm64/BUILD.bazel +++ b/labgrid/toolchain/config/qemu/arm64/BUILD.bazel @@ -17,7 +17,7 @@ labgrid_config_toolchain( "LG_OPENSSH_SCP": "$(location @openssh//:scp)", }, target_compatible_with = [ - "//constraint/device:qemu", + "//labgrid/constraint/device:qemu", "@toolchain_utils//toolchain/constraint/os:linux", "@toolchain_utils//toolchain/constraint/cpu:arm64", ], -- GitLab