summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2023-07-04 10:39:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-10 11:36:34 +0100
commit588ef3204dfc25eec21ac6fb063f33202c4efb2f (patch)
tree6ffe11079682412e2cd52f3c69fea4414cc5a80b
parent5276e9f9b842141ac4ceb470b401ee90f1341510 (diff)
downloadpoky-588ef3204dfc25eec21ac6fb063f33202c4efb2f.tar.gz
mdadm: re-add mdadm-ptest to PTESTS_SLOW
The ptest problems reported in e21021dc00ec ("mdadm: drop from PTESTS_SLOW") should now be fixed, so mdadm can be added back to PTESTS_SLOW (a qemux86-64 test run takes about ~12 minutes to execute with kvm). root@qemux86-64:~# ptest-runner mdadm START: ptest-runner 2023-06-30T08:25 BEGIN: /usr/lib/mdadm/ptest PASS: /usr/lib/mdadm/ptest/tests/00linear PASS: /usr/lib/mdadm/ptest/tests/00multipath ... PASS: /usr/lib/mdadm/ptest/tests/19repair-does-not-destroy PASS: /usr/lib/mdadm/ptest/tests/20raid5journal PASS: /usr/lib/mdadm/ptest/tests/21raid5cache DURATION: 723 END: /usr/lib/mdadm/ptest 2023-06-30T09:16 STOP: ptest-runner TOTAL: 1 FAIL: 0 For the testcases to run correctly, there must be enough rootfs space to create 13 loop devices. Similar to strace and lttng-tools, add a new IMAGE_ROOTFS_EXTRA_SPACE entry for mdadm-ptest. (From OE-Core rev: dfefff63c547adb1add0c8e3a308b2d0bd6cfc8c) Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/ptest-packagelists.inc3
-rw-r--r--meta/recipes-core/images/core-image-ptest.bb1
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index da9153b998..6250cf081e 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -99,6 +99,7 @@ PTESTS_SLOW = "\
99 libgcrypt \ 99 libgcrypt \
100 libmodule-build-perl \ 100 libmodule-build-perl \
101 lttng-tools \ 101 lttng-tools \
102 mdadm \
102 openssh \ 103 openssh \
103 openssl \ 104 openssl \
104 parted \ 105 parted \
@@ -122,7 +123,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind"
122# rt-tests \ # Needs to be checked whether it runs at all 123# rt-tests \ # Needs to be checked whether it runs at all
123# bash \ # Test outcomes are non-deterministic by design 124# bash \ # Test outcomes are non-deterministic by design
124# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py 125# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
125# mdadm \ # Tests rely on non-deterministic sleep() amounts
126# libinput \ # Tests need an unloaded system to be reliable 126# libinput \ # Tests need an unloaded system to be reliable
127# libpam \ # Needs pam DISTRO_FEATURE 127# libpam \ # Needs pam DISTRO_FEATURE
128# numactl \ # qemu not (yet) configured for numa; all tests are skipped 128# numactl \ # qemu not (yet) configured for numa; all tests are skipped
@@ -134,7 +134,6 @@ PTESTS_PROBLEMS = "\
134 rt-tests \ 134 rt-tests \
135 bash \ 135 bash \
136 ifupdown \ 136 ifupdown \
137 mdadm \
138 libinput \ 137 libinput \
139 libpam \ 138 libpam \
140 libseccomp \ 139 libseccomp \
diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb
index 90c26641ba..ddc56c8f9f 100644
--- a/meta/recipes-core/images/core-image-ptest.bb
+++ b/meta/recipes-core/images/core-image-ptest.bb
@@ -19,6 +19,7 @@ BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS').split()]
19# strace-ptest in particular needs more than 500MB 19# strace-ptest in particular needs more than 500MB
20IMAGE_OVERHEAD_FACTOR = "1.0" 20IMAGE_OVERHEAD_FACTOR = "1.0"
21IMAGE_ROOTFS_EXTRA_SPACE = "324288" 21IMAGE_ROOTFS_EXTRA_SPACE = "324288"
22IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-mdadm = "1524288"
22IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288" 23IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288"
23IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288" 24IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288"
24 25