Re: [PATCH] ci: Add test cases for container fetching and loading

[Uladzimir Bely <ubely@ilbers.de>]

On Mon, 2024-08-05 at 11:17 +0200, Jan Kiszka wrote:
> On 05.08.24 09:16, Uladzimir Bely wrote:
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> > 
> > This plugs the two example recipes for loading container images
> > into
> > VM-based testing. The test consists of running 'true' in the
> > installed
> > alpine images.
> > 
> > Rather than enabling the ci user to do password-less sudo, this
> > uses su
> > with the piped-in password. Another trick needed is to poll for the
> > images because loading is performed asynchronously.
> > 
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > ---
> >  .../recipes-core/images/isar-image-ci.bb      |  2 ++
> >  testsuite/citest.py                           | 24
> > +++++++++++++++++++
> >  2 files changed, 26 insertions(+)
> > 
> > This is a drop-in replacement of patch 4 from "[PATCH v4 0/5]
> > Introduce
> > container fetcher and pre-loader" series:
> > - Fixed syntax errors (incorrectly escaped '\$')
> 
> IIRC, we do need the escape inside the shell (sh -c '...'). So, you
> likely rather need to escape the escape character.
> 
> Jan
> 
> > 

I just tried to make a simple check:

```
$ su -c 'for i in $(seq 3); do echo $i; done'
Password: 
1
2
3

$ su -c 'for i in \$(seq 3); do echo $i; done'
Password: 
bash: -c: line 1: syntax error near unexpected token `('
bash: -c: line 1: `for i in \$(seq 3); do echo $i; done'

$ su -c 'for i in \\$(seq 3); do echo $i; done'
Password: 
\1
2
3
```

We are likely don't need escaping at all.

Anyway, we could just convert the tests from "cmd=<long_command"
to "script=test_prebuild_container.sh" and have test logic in a human-
readable form.

> > - Fixed long lines in order to pass flake8
> > 
> > diff --git a/meta-test/recipes-core/images/isar-image-ci.bb b/meta-
> > test/recipes-core/images/isar-image-ci.bb
> > index e5d51e6e..9133da74 100644
> > --- a/meta-test/recipes-core/images/isar-image-ci.bb
> > +++ b/meta-test/recipes-core/images/isar-image-ci.bb
> > @@ -16,6 +16,7 @@ IMAGE_INSTALL += "sshd-regen-keys"
> >  
> >  # qemuamd64-bookworm
> >  WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks"
> > +IMAGE_INSTALL:append:qemuamd64:debian-bookworm = " prebuilt-
> > docker-img prebuilt-podman-img"
> >  
> >  # qemuamd64-bullseye
> >  IMAGE_FSTYPES:append:qemuamd64:debian-bullseye ?= " cpio.gz
> > tar.gz"
> > @@ -51,3 +52,4 @@ IMAGER_INSTALL:append:qemuarm:debian-bookworm ?=
> > " ${SYSTEMD_BOOTLOADER_INSTALL}
> >  # qemuarm64-bookworm
> >  IMAGE_FSTYPES:append:qemuarm64:debian-bookworm ?= " wic.xz"
> >  IMAGER_INSTALL:append:qemuarm64:debian-bookworm ?= "
> > ${GRUB_BOOTLOADER_INSTALL}"
> > +IMAGE_INSTALL:append:qemuarm64:debian-bookworm = " prebuilt-
> > docker-img prebuilt-podman-img"
> > diff --git a/testsuite/citest.py b/testsuite/citest.py
> > index 7064c1e4..4a248a49 100755
> > --- a/testsuite/citest.py
> > +++ b/testsuite/citest.py
> > @@ -609,3 +609,27 @@ class VmBootTestFull(CIBaseTest):
> >              image='isar-image-ci',
> >              script='test_kernel_module.sh example_module',
> >          )
> > +
> > +    def test_amd64_bookworm_prebuilt_containers(self):
> > +        self.init()
> > +        self.vm_start(
> > +            'amd64', 'bookworm', image='isar-image-ci',
> > +            cmd='echo root | su -c \'PATH=$PATH:/usr/sbin;'
> > +                'for n in $(seq 30);'
> > +                '  do docker images | grep -q alpine && break;
> > sleep 10; done;'
> > +                'docker run --rm quay.io/libpod/alpine:3.10.2 true
> > && '
> > +                'for n in $(seq 30);'
> > +                '  do podman images | grep -q alpine && break;
> > sleep 10; done;'
> > +                'podman run --rm quay.io/libpod/alpine:latest
> > true\'')
> > +
> > +    def test_arm64_bookworm_prebuilt_containers(self):
> > +        self.init()
> > +        self.vm_start(
> > +            'arm64', 'bookworm', image='isar-image-ci',
> > +            cmd='echo root | su -c \'PATH=$PATH:/usr/sbin;'
> > +                'for n in $(seq 30);'
> > +                '  do docker images | grep -q alpine && break;
> > sleep 10; done;'
> > +                'docker run --rm quay.io/libpod/alpine:3.10.2 true
> > && '
> > +                'for n in $(seq 30);'
> > +                '  do podman images | grep -q alpine && break;
> > sleep 10; done;'
> > +                'podman run --rm quay.io/libpod/alpine:latest
> > true\'')
> 

-- 
Best regards,
Uladzimir.



-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/e13246ee69f545d47edc49c571a7c340ed76a4a1.camel%40ilbers.de.