Re: [PATCH 08/11] testsuite: Support running custom commands in VM

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 24 Jan 2023 08:14:04 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> Am Fri, 13 Jan 2023 08:19:39 +0100
> schrieb Uladzimir Bely <ubely@ilbers.de>:
> 
> > By specifying `cmd='<command>'` it's now possible to run VM and
> > execute the command over SSH connection.
> > 
> > If this is not specified, tests uses previous approach, with
> > parsing output log and searching some specific fragments.
> > 
> > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > ---
> >  testsuite/cibuilder.py | 60
> > +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59
> > insertions(+), 1 deletion(-)
> > 
> > diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
> > index 9e9cc8a3..4496b0dd 100755
> > --- a/testsuite/cibuilder.py
> > +++ b/testsuite/cibuilder.py
> > @@ -2,6 +2,7 @@
> >  
> >  import logging
> >  import os
> > +import re
> >  import select
> >  import shutil
> >  import subprocess
> > @@ -201,11 +202,44 @@ class CIBuilder(Test):
> >  
> >          return env['LAYERDIR_' + layer].strip('"')
> >  
> > -    def vm_start(self, arch='amd64', distro='buster',
> > image='isar-image-base', enforce_pcbios=False):
> > +    def vm_exec_cmd(self, cmd='/bin/true', timeout=10, port=None):
> > +        spk = os.path.dirname(__file__) + '/keys/ssh/id_rsa'
> > +        os.chmod(spk, 0o400)
> > +
> > +        port_args = ''
> > +        if port:
> > +            port_args = ' -p ' + str(port)
> > +
> > +        cmd_prefix = 'ssh' + port_args + \
> > +                     ' -o ConnectTimeout=5 -o IdentityFile=' + spk
> > + \
> > +                     ' -o StrictHostKeyChecking=no ci@localhost '
> 
> What is the username? My guess would be root. Let us make that
> explicit and see if we can at some point get away with running this
> as non-root while we root into the VMs.

Forget the comment ... the username is "ci"

Henning

> Henning
> 
> > +        self.log.debug('Waiting for SSH server ready...')
> > +
> > +        rc = None
> > +        while time.time() < timeout and rc != 0:
> > +            rc = subprocess.call('exec ' + cmd_prefix +
> > '/bin/true',
> > +                                 shell=True,
> > +                                 stdin=subprocess.PIPE,
> > stdout=subprocess.PIPE,
> > +                                 stderr=subprocess.PIPE)
> > +            time.sleep(1)
> > +        if rc != 0:
> > +            self.log.error('SSH server is not ready')
> > +            return -1
> > +
> > +        rc = subprocess.call('exec ' + cmd_prefix + cmd,
> > shell=True,
> > +                             stdin=subprocess.PIPE,
> > stdout=subprocess.PIPE,
> > +                             stderr=subprocess.PIPE)
> > +        time.sleep(1)
> > +
> > +        return rc
> > +
> > +    def vm_start(self, arch='amd64', distro='buster',
> > image='isar-image-base',
> > +                 enforce_pcbios=False, cmd=None):
> >          time_to_wait = self.params.get('time_to_wait', default=60)
> >  
> >          self.log.info('===================================================')
> >          self.log.info('Running Isar VM boot test for (' + distro +
> > '-' + arch + ')')
> > +        self.log.info('Remote command is ' + str(cmd))
> >          self.log.info('Isar build folder is: ' + self.build_dir)
> >          self.log.info('===================================================')
> >  
> > @@ -256,6 +290,30 @@ class CIBuilder(Test):
> >          p1 = subprocess.Popen('exec ' + ' '.join(cmdline),
> > shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
> > stderr=subprocess.PIPE, universal_newlines=True)
> > +
> > +        if cmd is not None:
> > +            rc = None
> > +            try:
> > +                port = None
> > +                for arg in cmdline:
> > +                    match = re.match(r".*hostfwd=tcp::(\d*).*",
> > arg)
> > +                    if match:
> > +                        port = match.group(1)
> > +                        break
> > +
> > +                rc = self.vm_exec_cmd(cmd, timeout, port)
> > +                self.log.debug('`' + cmd + '` returned ' + str(rc))
> > +            finally:
> > +                if p1.poll() is None:
> > +                    self.log.debug('Killing qemu...')
> > +                    p1.kill()
> > +                p1.wait()
> > +
> > +            if rc != 0:
> > +                self.fail('Log ' + output_file)
> > +
> > +            return
> > +
> >          try:
> >              poller = select.poll()
> >              poller.register(p1.stdout, select.POLLIN)
>