From 17b9c485315dd66909cb33b9b83e5fc4a3e7f088 Mon Sep 17 00:00:00 2001 From: Alex Tercete Date: Wed, 9 Apr 2025 14:46:16 +0100 Subject: [PATCH 1/2] fix: rename `configurable` to `ssh` BREAKING CHANGE: `@rules_labgrid//labgrid/constraint/device:configurable` has been renamed to `@rules_labgrid//labgrid/constraint/device:ssh` --- labgrid/constraint/device/BUILD.bazel | 2 +- labgrid/toolchain/config/{configurable => ssh}/BUILD.bazel | 4 ++-- labgrid/toolchain/config/{configurable => ssh}/config.yaml | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename labgrid/toolchain/config/{configurable => ssh}/BUILD.bazel (91%) rename labgrid/toolchain/config/{configurable => ssh}/config.yaml (100%) diff --git a/labgrid/constraint/device/BUILD.bazel b/labgrid/constraint/device/BUILD.bazel index 011b63d0..0b3ab271 100644 --- a/labgrid/constraint/device/BUILD.bazel +++ b/labgrid/constraint/device/BUILD.bazel @@ -25,7 +25,7 @@ constraint_value( ) constraint_value( - name = "configurable", + name = "ssh", constraint_setting = ":device", visibility = ["//visibility:public"], ) diff --git a/labgrid/toolchain/config/configurable/BUILD.bazel b/labgrid/toolchain/config/ssh/BUILD.bazel similarity index 91% rename from labgrid/toolchain/config/configurable/BUILD.bazel rename to labgrid/toolchain/config/ssh/BUILD.bazel index 8027ecf2..89666f26 100644 --- a/labgrid/toolchain/config/configurable/BUILD.bazel +++ b/labgrid/toolchain/config/ssh/BUILD.bazel @@ -1,7 +1,7 @@ load("//labgrid/config/toolchain:defs.bzl", "labgrid_config_toolchain") labgrid_config_toolchain( - name = "configurable", + name = "ssh", src = "config.yaml", env = { "LG_NETWORK_ADDRESS": "$(NETWORK_ADDRESS)", @@ -12,7 +12,7 @@ labgrid_config_toolchain( "LG_OPENSSH_SCP": "$(location @openssh//:scp)", }, target_compatible_with = [ - "//labgrid/constraint/device:configurable", + "//labgrid/constraint/device:ssh", ], toolchains = [ "//labgrid/flag/device:address", diff --git a/labgrid/toolchain/config/configurable/config.yaml b/labgrid/toolchain/config/ssh/config.yaml similarity index 100% rename from labgrid/toolchain/config/configurable/config.yaml rename to labgrid/toolchain/config/ssh/config.yaml -- GitLab From 253e34a9797f41e445526f7a28d39d91601314d1 Mon Sep 17 00:00:00 2001 From: Alex Tercete Date: Wed, 9 Apr 2025 14:49:29 +0100 Subject: [PATCH 2/2] feat: add `ssh` device platforms --- labgrid/platform/BUILD.bazel | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/labgrid/platform/BUILD.bazel b/labgrid/platform/BUILD.bazel index e8a3d521..bc30a062 100644 --- a/labgrid/platform/BUILD.bazel +++ b/labgrid/platform/BUILD.bazel @@ -1,3 +1,5 @@ +CPUS = ("amd64", "arm64") + platform( name = "localhost", constraint_values = ["//labgrid/constraint/device:localhost"], @@ -15,5 +17,18 @@ platform( ], visibility = ["//visibility:public"], ) - for cpu in ("amd64", "arm64") + for cpu in CPUS +] + +[ + platform( + name = "ssh-{}-linux".format(cpu), + constraint_values = [ + "//labgrid/constraint/device:ssh", + "@toolchain_utils//toolchain/constraint/os:linux", + "@toolchain_utils//toolchain/constraint/cpu:{}".format(cpu), + ], + visibility = ["//visibility:public"], + ) + for cpu in CPUS ] -- GitLab