summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2023-07-04 10:39:19 +0300
committerSteve Sakoman <steve@sakoman.com>2023-08-01 06:17:28 -1000
commit83df23574b1d30805c334aa9422cab3f33943449 (patch)
tree17d5455da74248dae2228eddfd96a1e98034634a /meta
parent74d65cb990467345940ee949e7f0f038ec2e4850 (diff)
downloadpoky-83df23574b1d30805c334aa9422cab3f33943449.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: 174ef92965acd605e5aa5ed26afb3f8d556e98b2) Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dfefff63c547adb1add0c8e3a308b2d0bd6cfc8c) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-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 003348906a..674801d8b8 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -96,6 +96,7 @@ PTESTS_SLOW = "\
96 libgcrypt \ 96 libgcrypt \
97 libmodule-build-perl \ 97 libmodule-build-perl \
98 lttng-tools \ 98 lttng-tools \
99 mdadm \
99 openssh \ 100 openssh \
100 openssl \ 101 openssl \
101 parted \ 102 parted \
@@ -119,7 +120,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind"
119# rt-tests \ # Needs to be checked whether it runs at all 120# rt-tests \ # Needs to be checked whether it runs at all
120# bash \ # Test outcomes are non-deterministic by design 121# bash \ # Test outcomes are non-deterministic by design
121# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py 122# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
122# mdadm \ # Tests rely on non-deterministic sleep() amounts
123# libinput \ # Tests need an unloaded system to be reliable 123# libinput \ # Tests need an unloaded system to be reliable
124# libpam \ # Needs pam DISTRO_FEATURE 124# libpam \ # Needs pam DISTRO_FEATURE
125# numactl \ # qemu not (yet) configured for numa; all tests are skipped 125# numactl \ # qemu not (yet) configured for numa; all tests are skipped
@@ -132,7 +132,6 @@ PTESTS_PROBLEMS = "\
132 rt-tests \ 132 rt-tests \
133 bash \ 133 bash \
134 ifupdown \ 134 ifupdown \
135 mdadm \
136 libinput \ 135 libinput \
137 libpam \ 136 libpam \
138 libseccomp \ 137 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