diff options
author | Thomas Roos <throos@amazon.de> | 2023-05-17 16:36:13 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-07-20 12:10:40 -1000 |
commit | 4f1eb64d154da11acf5835e0e72c9a5f5b9f7f3d (patch) | |
tree | 2e06034a5f88a9f5925cf2684dc16021af9a8fbf /meta/classes-recipe | |
parent | 4c02657a44aa9a8fdc0a804793120f0018d8528a (diff) | |
download | poky-4f1eb64d154da11acf5835e0e72c9a5f5b9f7f3d.tar.gz |
testimage/oeqa: Drop testimage_dump_host functionality
The intent behind these functions was to dump the system state when issues occured
but it has never really worked as we'd planned. Regular monitoring as the build
runs has largely replaced this as that allows a trend to be seen rather than a spot
value which was never really useful. The code is bitrotting and not functioning
correctly so drop it.
[YOCTO #13872]
RP: Reword commit message
(From OE-Core rev: 8d1bc34cffdd9f054e51db4e880747c79bf834fe)
Signed-off-by: Thomas Roos <throos@amazon.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dea37ba49a236029da73d5cfbfc069bffc38b508)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r-- | meta/classes-recipe/testexport.bbclass | 6 | ||||
-rw-r--r-- | meta/classes-recipe/testimage.bbclass | 20 |
2 files changed, 2 insertions, 24 deletions
diff --git a/meta/classes-recipe/testexport.bbclass b/meta/classes-recipe/testexport.bbclass index 0f0c56107f..572f5d9e76 100644 --- a/meta/classes-recipe/testexport.bbclass +++ b/meta/classes-recipe/testexport.bbclass | |||
@@ -61,16 +61,12 @@ def testexport_main(d): | |||
61 | d.getVar("TEST_TARGET"), None, d.getVar("TEST_TARGET_IP"), | 61 | d.getVar("TEST_TARGET"), None, d.getVar("TEST_TARGET_IP"), |
62 | d.getVar("TEST_SERVER_IP")) | 62 | d.getVar("TEST_SERVER_IP")) |
63 | 63 | ||
64 | host_dumper = OERuntimeTestContextExecutor.getHostDumper( | ||
65 | d.getVar("testimage_dump_host"), d.getVar("TESTIMAGE_DUMP_DIR")) | ||
66 | |||
67 | image_manifest = "%s.manifest" % image_name | 64 | image_manifest = "%s.manifest" % image_name |
68 | image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) | 65 | image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) |
69 | 66 | ||
70 | extract_dir = d.getVar("TEST_EXTRACTED_DIR") | 67 | extract_dir = d.getVar("TEST_EXTRACTED_DIR") |
71 | 68 | ||
72 | tc = OERuntimeTestContext(td, logger, target, host_dumper, | 69 | tc = OERuntimeTestContext(td, logger, target, image_packages, extract_dir) |
73 | image_packages, extract_dir) | ||
74 | 70 | ||
75 | copy_needed_files(d, tc) | 71 | copy_needed_files(d, tc) |
76 | 72 | ||
diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index b48cd96575..cc3650ad42 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass | |||
@@ -115,18 +115,6 @@ testimage_dump_target () { | |||
115 | find /var/log/ -type f 2>/dev/null -exec echo "====================" \; -exec echo {} \; -exec echo "====================" \; -exec cat {} \; -exec echo "" \; | 115 | find /var/log/ -type f 2>/dev/null -exec echo "====================" \; -exec echo {} \; -exec echo "====================" \; -exec cat {} \; -exec echo "" \; |
116 | } | 116 | } |
117 | 117 | ||
118 | testimage_dump_host () { | ||
119 | top -bn1 | ||
120 | iostat -x -z -N -d -p ALL 20 2 | ||
121 | ps -ef | ||
122 | free | ||
123 | df | ||
124 | memstat | ||
125 | dmesg | ||
126 | ip -s link | ||
127 | netstat -an | ||
128 | } | ||
129 | |||
130 | testimage_dump_monitor () { | 118 | testimage_dump_monitor () { |
131 | query-status | 119 | query-status |
132 | query-block | 120 | query-block |
@@ -339,19 +327,13 @@ def testimage_main(d): | |||
339 | # runtime use network for download projects for build | 327 | # runtime use network for download projects for build |
340 | export_proxies(d) | 328 | export_proxies(d) |
341 | 329 | ||
342 | # we need the host dumper in test context | ||
343 | host_dumper = OERuntimeTestContextExecutor.getHostDumper( | ||
344 | d.getVar("testimage_dump_host"), | ||
345 | d.getVar("TESTIMAGE_DUMP_DIR")) | ||
346 | |||
347 | # the robot dance | 330 | # the robot dance |
348 | target = OERuntimeTestContextExecutor.getTarget( | 331 | target = OERuntimeTestContextExecutor.getTarget( |
349 | d.getVar("TEST_TARGET"), logger, d.getVar("TEST_TARGET_IP"), | 332 | d.getVar("TEST_TARGET"), logger, d.getVar("TEST_TARGET_IP"), |
350 | d.getVar("TEST_SERVER_IP"), **target_kwargs) | 333 | d.getVar("TEST_SERVER_IP"), **target_kwargs) |
351 | 334 | ||
352 | # test context | 335 | # test context |
353 | tc = OERuntimeTestContext(td, logger, target, host_dumper, | 336 | tc = OERuntimeTestContext(td, logger, target, image_packages, extract_dir) |
354 | image_packages, extract_dir) | ||
355 | 337 | ||
356 | # Load tests before starting the target | 338 | # Load tests before starting the target |
357 | test_paths = get_runtime_paths(d) | 339 | test_paths = get_runtime_paths(d) |