diff options
author | Alexis Lothoré <alexis.lothore@bootlin.com> | 2024-07-05 16:46:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-08 09:17:09 +0100 |
commit | 6e80b2ab660e60135b52bd7358f0ce7612226f06 (patch) | |
tree | d287fab3f08d2f06cb0f30dbb45318a526817163 | |
parent | e98a6f6812d149250a683ddfa11f5d0df422c0f2 (diff) | |
download | poky-6e80b2ab660e60135b52bd7358f0ce7612226f06.tar.gz |
oeqa/utils/postactions: transfer whole archive over ssh instead of doing individual copies
Fixes [YOCTO 15536]
The postactions retrieval actions currently rely on scp executed
individually on any file or directory expanded from
TESTIMAGE_FAILED_QA_ARTIFACTS. Unfortunately, symlinks are not preserved
with this mechanism, which lead to big storage space consumption. Things
may go even worse if those symlinks create some circular chains. This
mechanism then needs to be updated to preserve symlinks instead of
following them during copy. There are multiple ways to do it:
- create a local archive on the target and execute scp on this file
- use rsync instead of scp for all files
- create an archive and pipe it to ssh instead of storing it onto the
target
The first solution may create pressure on targets storage space, while the
second assumes that rsync is installed on the target, which may not be
true. So the third one is a compromise: tar is very likely present, at
least through busybox, and no disk space is used on the target.
Replace the current per-file scp call by a single call to tar run on the
target. Retrieve the generated compressed archive directly from SSH output,
and feed it to another tar process but on host, to uncompress and extract
it at the same place as before.
(From OE-Core rev: 4aeb10aa38efc6768928fbb74985e36e972b8e46)
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/utils/postactions.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py index ecdddd2d40..2a08129d6c 100644 --- a/meta/lib/oeqa/utils/postactions.py +++ b/meta/lib/oeqa/utils/postactions.py | |||
@@ -62,17 +62,16 @@ def get_artifacts_list(target, raw_list): | |||
62 | return result | 62 | return result |
63 | 63 | ||
64 | def retrieve_test_artifacts(target, artifacts_list, target_dir): | 64 | def retrieve_test_artifacts(target, artifacts_list, target_dir): |
65 | import io, subprocess | ||
65 | local_artifacts_dir = os.path.join(target_dir, "artifacts") | 66 | local_artifacts_dir = os.path.join(target_dir, "artifacts") |
66 | for artifact_path in artifacts_list: | 67 | try: |
67 | if not os.path.isabs(artifact_path): | 68 | cmd = "tar zcf - " + " ".join(artifacts_list) |
68 | bb.warn(f"{artifact_path} is not an absolute path") | 69 | (status, output) = target.run(cmd, raw = True) |
69 | continue | 70 | if status != 0 or not output: |
70 | try: | 71 | raise Exception("Error while fetching compressed artifacts") |
71 | dest_dir = os.path.join(local_artifacts_dir, os.path.dirname(artifact_path[1:])) | 72 | p = subprocess.run(["tar", "zxf", "-", "-C", local_artifacts_dir], input=output) |
72 | os.makedirs(dest_dir, exist_ok=True) | 73 | except Exception as e: |
73 | target.copyFrom(artifact_path, dest_dir) | 74 | bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") |
74 | except Exception as e: | ||
75 | bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") | ||
76 | 75 | ||
77 | def list_and_fetch_failed_tests_artifacts(d, tc): | 76 | def list_and_fetch_failed_tests_artifacts(d, tc): |
78 | artifacts_list = get_artifacts_list(tc.target, d.getVar("TESTIMAGE_FAILED_QA_ARTIFACTS")) | 77 | artifacts_list = get_artifacts_list(tc.target, d.getVar("TESTIMAGE_FAILED_QA_ARTIFACTS")) |