Merge branch 'master' into step-formatter-issue

Author: cidlik

dockerfiles/build.sh

@@ -31,7 +31,7 @@ has_buildx() {
     local docker_cmd
     docker_cmd="${1}"
 
-    "${docker_cmd}" buildx --help >/dev/null 2>&1
+    "${docker_cmd}" buildx version >/dev/null 2>&1
 }
 
 get_docker_cmd() {

labgrid/driver/networkinterfacedriver.py

@@ -60,7 +60,7 @@ def configure(self, settings):
         self.proxy.configure(self.iface.ifname, settings)
 
     @Driver.check_active
-    @step()
+    @step(args=["expected"])
     def wait_state(self, expected, timeout=60):
         """Wait until the expected state is reached or the timeout expires.
 

labgrid/driver/sshdriver.py

@@ -41,6 +41,15 @@ class SSHDriver(CommandMixin, Driver, CommandProtocol, FileTransferProtocol):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         self._keepalive = None
+        self._ssh = self._get_tool("ssh")
+        self._scp = self._get_tool("scp")
+        self._sshfs = self._get_tool("sshfs")
+        self._rsync = self._get_tool("rsync")
+
+    def _get_tool(self, name):
+        if self.target.env:
+            return self.target.env.config.get_tool(name)
+        return name
 
     def _get_username(self):
         """Get the username from this class or from NetworkService"""
@@ -105,7 +114,7 @@ def _start_own_master_once(self, timeout):
             self.tmpdir, f'control-{self.networkservice.address}'
         )
 
-        args = ["ssh", "-f", *self.ssh_prefix, "-x", "-o", f"ConnectTimeout={timeout}",
+        args = [self._ssh, "-f", *self.ssh_prefix, "-x", "-o", f"ConnectTimeout={timeout}",
                  "-o", "ControlPersist=300", "-o",
                  "UserKnownHostsFile=/dev/null", "-o", "StrictHostKeyChecking=no",
                  "-o", "ServerAliveInterval=15", "-MN", "-S", control.replace('%', '%%'), "-p",
@@ -203,7 +212,7 @@ def _run(self, cmd, codec="utf-8", decodeerrors="strict", timeout=None):
         if not self._check_keepalive():
             raise ExecutionError("Keepalive no longer running")
 
-        complete_cmd = ["ssh", "-x", *self.ssh_prefix,
+        complete_cmd = [self._ssh, "-x", *self.ssh_prefix,
                         "-p", str(self.networkservice.port), "-l", self._get_username(),
                         self.networkservice.address
                         ] + cmd.split(" ")
@@ -238,7 +247,7 @@ def interact(self, cmd=None):
         if not self._check_keepalive():
             raise ExecutionError("Keepalive no longer running")
 
-        complete_cmd = ["ssh", "-x", *self.ssh_prefix,
+        complete_cmd = [self._ssh, "-x", *self.ssh_prefix,
                         "-t",
                         self.networkservice.address
                         ]
@@ -252,7 +261,7 @@ def interact(self, cmd=None):
 
     @contextlib.contextmanager
     def _forward(self, forward):
-        cmd = ["ssh", *self.ssh_prefix,
+        cmd = [self._ssh, *self.ssh_prefix,
                "-O", "forward", forward,
                self.networkservice.address
                ]
@@ -261,7 +270,7 @@ def _forward(self, forward):
         try:
             yield
         finally:
-            cmd = ["ssh", *self.ssh_prefix,
+            cmd = [self._ssh, *self.ssh_prefix,
                    "-O", "cancel", forward,
                    self.networkservice.address
                    ]
@@ -361,7 +370,8 @@ def scp(self, *, src, dst):
         if dst.startswith(':'):
             dst = '_' + dst
 
-        complete_cmd = ["scp",
+        complete_cmd = [self._scp,
+                "-S", self._ssh,
                 "-F", "none",
                 "-o", f"ControlPath={self.control.replace('%', '%%')}",
                 src, dst,
@@ -391,12 +401,12 @@ def rsync(self, *, src, dst, extra=[]):
         if dst.startswith(':'):
             dst = '_' + dst
 
-        ssh_cmd = ["ssh",
+        ssh_cmd = [self._ssh,
                 "-F", "none",
                 "-o", f"ControlPath={self.control.replace('%', '%%')}",
         ]
 
-        complete_cmd = ["rsync",
+        complete_cmd = [self._rsync,
                 "-v",
                 f"--rsh={' '.join(ssh_cmd)}",
                 "-rlpt",  # --recursive --links --perms --times
@@ -417,7 +427,7 @@ def sshfs(self, *, path, mountpoint):
         if not self._check_keepalive():
             raise ExecutionError("Keepalive no longer running")
 
-        complete_cmd = ["sshfs",
+        complete_cmd = [self._sshfs,
                 "-F", "none",
                 "-f",
                 "-o", f"ControlPath={self.control.replace('%', '%%')}",
@@ -445,7 +455,7 @@ def get_status(self):
 
     @cached_property
     def _ssh_version(self):
-        version = subprocess.run(["ssh", "-V"], capture_output=True, text=True)
+        version = subprocess.run([self._ssh, "-V"], capture_output=True, text=True)
         version = re.match(r"^OpenSSH_(\d+)\.(\d+)", version.stderr)
         return tuple(int(x) for x in version.groups())
 
@@ -472,7 +482,8 @@ def _scp_supports_explicit_scp_mode(self):
     @step(args=['filename', 'remotepath'])
     def put(self, filename, remotepath=''):
         transfer_cmd = [
-            "scp",
+            self._scp,
+            "-S", self._ssh,
             *self.ssh_prefix,
             "-P", str(self.networkservice.port),
             "-r",
@@ -502,7 +513,8 @@ def put(self, filename, remotepath=''):
     @step(args=['filename', 'destination'])
     def get(self, filename, destination="."):
         transfer_cmd = [
-            "scp",
+            self._scp,
+            "-S", self._ssh,
             *self.ssh_prefix,
             "-P", str(self.networkservice.port),
             "-r",
@@ -530,7 +542,7 @@ def get(self, filename, destination="."):
 
     def _cleanup_own_master(self):
         """Exit the controlmaster and delete the tmpdir"""
-        complete_cmd = f"ssh -x -o ControlPath={self.control.replace('%', '%%')} -O exit -p {self.networkservice.port} -l {self._get_username()} {self.networkservice.address}".split(' ')  # pylint: disable=line-too-long
+        complete_cmd = f"{self._ssh} -x -o ControlPath={self.control.replace('%', '%%')} -O exit -p {self.networkservice.port} -l {self._get_username()} {self.networkservice.address}".split(' ')  # pylint: disable=line-too-long
         res = subprocess.call(
             complete_cmd,
             stdin=subprocess.DEVNULL,
@@ -547,7 +559,7 @@ def _cleanup_own_master(self):
 
     def _start_keepalive(self):
         """Starts a keepalive connection via the own or external master."""
-        args = ["ssh", *self.ssh_prefix, self.networkservice.address, "cat"]
+        args = [self._ssh, *self.ssh_prefix, self.networkservice.address, "cat"]
 
         assert self._keepalive is None
         self._keepalive = subprocess.Popen(

labgrid/remote/client.py

@@ -448,9 +448,13 @@ def _check_allowed(self, place):
         if f"{self.gethostname()}/{self.getuser()}" not in place.allowed:
             host, user = place.acquired.split("/")
             if user != self.getuser():
-                raise UserError(f"place {place.name} is not acquired by your user, acquired by {user}")
+                raise UserError(
+                    f"place {place.name} is not acquired by your user, acquired by {user}. To work simultaneously, {user} can execute labgrid-client -p {place.name} allow {self.gethostname()}/{self.getuser()}"
+                )
             if host != self.gethostname():
-                raise UserError(f"place {place.name} is not acquired on this computer, acquired on {host}")
+                raise UserError(
+                    f"place {place.name} is not acquired on this computer, acquired on {host}. To allow this host, use labgrid-client -p {place.name} allow {self.gethostname()}/{self.getuser()} on the other host"
+                )
 
     def get_place(self, place=None):
         pattern = place or self.args.place
@@ -468,7 +472,10 @@ def get_place(self, place=None):
     def get_idle_place(self, place=None):
         place = self.get_place(place)
         if place.acquired:
-            raise UserError(f"place {place.name} is not idle (acquired by {place.acquired})")
+            _, user = place.acquired.split("/")
+            raise UserError(
+                f"place {place.name} is not idle (acquired by {place.acquired}). To work simultaneously, {user} can execute labgrid-client -p {place.name} allow {self.gethostname()}/{self.getuser()}"
+            )
         return place
 
     def get_acquired_place(self, place=None):
@@ -1425,7 +1432,7 @@ async def create_reservation(self):
                 raise UserError(f"'{pair}' is not a valid filter (must contain a '=')")
             if not TAG_KEY.match(k):
                 raise UserError(f"Key '{k}' in filter '{pair}' is invalid")
-            if not TAG_KEY.match(v):
+            if not TAG_VAL.match(v):
                 raise UserError(f"Value '{v}' in filter '{pair}' is invalid")
             fltr[k] = v