Hi Alexandre,
On Fri, 13 Aug 2021 at 07:41, Daniel Gomez via lists.openembedded.org
<daniel=qtec....@lists.openembedded.org> wrote:
>
> Hi Alexandre,
>
> On Thu, 12 Aug 2021 at 18:34, Alexandre Belloni
> <alexandre.bell...@bootlin.com> wrote:
> >
> > Hello,
> >
> > On 10/08/2021 22:11:01+0200, Daniel Gomez wrote:
> > > Add tests for the --no-fstab-update wic part command.
> > >
> > > Signed-off-by: Daniel Gomez <dan...@qtec.com>
> > > ---
> > > meta/lib/oeqa/selftest/cases/wic.py | 56 +++++++++++++++++++++++++++++
> > > 1 file changed, 56 insertions(+)
> > >
> > > diff --git a/meta/lib/oeqa/selftest/cases/wic.py
> > > b/meta/lib/oeqa/selftest/cases/wic.py
> > > index 2efbe514c1..a58360851a 100644
> > > --- a/meta/lib/oeqa/selftest/cases/wic.py
> > > +++ b/meta/lib/oeqa/selftest/cases/wic.py
> > > @@ -11,6 +11,7 @@
> > > import os
> > > import sys
> > > import unittest
> > > +import hashlib
> > >
> > > from glob import glob
> > > from shutil import rmtree, copy
> > > @@ -686,6 +687,61 @@ part /etc --source rootfs --fstype=ext4
> > > --change-directory=etc
> > > % (wks_file, self.resultdir),
> > > ignore_status=True).status)
> > > os.remove(wks_file)
> > >
> > > + def test_no_fstab_update(self):
> > > + """Test --no-fstab-update wks option."""
> > > +
> > > + oldpath = os.environ['PATH']
> > > + os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
> > > +
> > > + # Get stock fstab from base-files recipe
> > > + bitbake('base-files')
> > > + bf_fstab = os.path.join(get_bb_var('WORKDIR',
> > > 'base-files'),'image/etc/fstab')
> > > + bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' %
> > > bf_fstab).output.split(" ")[0]
> > > +
> >
> > This failed on the autobuilders:
> >
> > File
> > "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/selftest/cases/wic.py",
> > line 699, in test_no_fstab_update
> > bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' %
> > bf_fstab).output.split(" ")[0]
> > File
> > "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/utils/commands.py",
> > line 207, in runCmd
> > raise AssertionError("Command '%s' returned non-zero exit status
> > %d:\n%s" % (command, result.status, exc_output))
> > AssertionError: Command 'md5sum
> > /home/pokybuild/yocto-worker/oe-selftest-debian/build/build-st-15202/tmp/work/qemux86_64-poky-linux/base-files/3.0.14-r89/image/etc/fstab
> > 2>/dev/null' returned non-zero exit status 1:
> >
> > Full log here:
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2374/steps/14/logs/stdio
>
> Thanks for letting me know. I'll take a look.
I can't replicate the problem in my setup ('master' branch for bitbake
and openembedded core; 'qemux86-64' machine) . Could it be possible to
get the environment variables for the build?
The problem comes when executing the first md5sum command:
1. bitbake 'base-files' recipe.
2. Get the 'WORKDIR' for 'base-files' recipe.
3. Do 'md5sum' for the 'WORKDIR' + 'image/etc/fstab' file.
md5sum
/home/pokybuild/yocto-worker/oe-selftest-debian/build/build-st-15202/tmp/work/qemux86_64-poky-linux/base-files/3.0.14-r89/image/etc/fstab
If the file does not exist, md5sum will return the same '1' status
(assuming that's the error). Could this be bause the '${WORKDIR} +
image' for the 'base-files' recipe is located under another directory?
Could we get access to that directory to know if the file was present
there?
If that's the case, I could replace the command to be executed with
one of the following environment variables:
D="/workdir/openembedded-core/build/tmp-glibc/work/qemux86_64-oe-linux/base-files/3.0.14-r89/image"
PKGD="/workdir/openembedded-core/build/tmp-glibc/work/qemux86_64-oe-linux/base-files/3.0.14-r89/package"
PKGDEST="/workdir/openembedded-core/build/tmp-glibc/work/qemux86_64-oe-linux/base-files/3.0.14-r89/packages-split"
Otherwise, any ideas or suggestions?
Thanks
>
> >
> > > + try:
> > > + no_fstab_update_path = os.path.join(self.resultdir,
> > > 'test-no-fstab-update')
> > > + os.makedirs(no_fstab_update_path)
> > > + wks_file = os.path.join(no_fstab_update_path, 'temp.wks')
> > > + with open(wks_file, 'w') as wks:
> > > + wks.writelines(['part / --source rootfs --fstype=ext4
> > > --label rootfs\n',
> > > + 'part /mnt/p2 --source rootfs
> > > --rootfs-dir=core-image-minimal ',
> > > + '--fstype=ext4 --label p2
> > > --no-fstab-update\n'])
> > > + runCmd("wic create %s -e core-image-minimal -o %s" \
> > > + % (wks_file, self.resultdir))
> > > +
> > > + part_fstab_md5sum = []
> > > + for i in range(1, 3):
> > > + part = glob(os.path.join(self.resultdir,
> > > 'temp-*.direct.p') + str(i))[0]
> > > + part_fstab = runCmd("debugfs -R 'cat etc/fstab' %s
> > > 2>/dev/null" % (part))
> > > + part_fstab_md5sum.append(hashlib.md5((part_fstab.output
> > > + "\n\n").encode('utf-8')).hexdigest())
> > > +
> > > + # '/etc/fstab' in partition 2 should contain the same stock
> > > fstab file at base-file recipe.
> > > + self.assertEqual(bf_fstab_md5sum, part_fstab_md5sum[1])
> > > +
> > > + # '/etc/fstab' in partition 1 should contain an updated
> > > fstab file.
> > > + self.assertNotEqual(bf_fstab_md5sum, part_fstab_md5sum[0])
> > > +
> > > + finally:
> > > + os.environ['PATH'] = oldpath
> > > +
> > > + def test_no_fstab_update_errors(self):
> > > + """Test --no-fstab-update wks option error handling."""
> > > + wks_file = 'temp.wks'
> > > +
> > > + # Absolute argument.
> > > + with open(wks_file, 'w') as wks:
> > > + wks.write("part / --source rootfs --fstype=ext4
> > > --no-fstab-update /etc")
> > > + self.assertNotEqual(0, runCmd("wic create %s -e
> > > core-image-minimal -o %s" \
> > > + % (wks_file, self.resultdir),
> > > ignore_status=True).status)
> > > + os.remove(wks_file)
> > > +
> > > + # Argument pointing to parent directory.
> > > + with open(wks_file, 'w') as wks:
> > > + wks.write("part / --source rootfs --fstype=ext4
> > > --no-fstab-update ././..")
> > > + self.assertNotEqual(0, runCmd("wic create %s -e
> > > core-image-minimal -o %s" \
> > > + % (wks_file, self.resultdir),
> > > ignore_status=True).status)
> > > + os.remove(wks_file)
> > > +
> > > class Wic2(WicTestCase):
> > >
> > > def test_bmap_short(self):
> > > --
> > > 2.30.2
> > >
> >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
>
> Daniel
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154825):
https://lists.openembedded.org/g/openembedded-core/message/154825
Mute This Topic: https://lists.openembedded.org/mt/84801997/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
