From 02650255aa00a1f167496eb08c4d773b161a25f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 12 Jun 2024 18:57:34 +0100 Subject: [PATCH] oeqa/sdk/case: Ensure DL_DIR is populated with artefacts if used Where we're using DL_DIR in sdk archive to try and cache testing artefacts, copy into the cache so that it gets populated and this doesn't have to be done manually. Currently we're making a lot of repeat requests to github as this wasn't being populated. (From OE-Core rev: 048467673ceb075277c5a4fbbb40b9c3e41864e0) Signed-off-by: Richard Purdie (cherry picked from commit a3284958a2cc6c90a5fac26976bddc23f821c972) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/case.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/sdk/case.py b/meta/lib/oeqa/sdk/case.py index c45882689cb..46a3789f572 100644 --- a/meta/lib/oeqa/sdk/case.py +++ b/meta/lib/oeqa/sdk/case.py @@ -6,6 +6,7 @@ import os import subprocess +import shutil from oeqa.core.case import OETestCase @@ -21,12 +22,14 @@ def fetch(self, workdir, dl_dir, url, archive=None): archive = os.path.basename(urlparse(url).path) if dl_dir: - tarball = os.path.join(dl_dir, archive) - if os.path.exists(tarball): - return tarball + archive_tarball = os.path.join(dl_dir, archive) + if os.path.exists(archive_tarball): + return archive_tarball tarball = os.path.join(workdir, archive) subprocess.check_output(["wget", "-O", tarball, url], stderr=subprocess.STDOUT) + if dl_dir and not os.path.exists(archive_tarball): + shutil.copyfile(tarball, archive_tarball) return tarball def check_elf(self, path, target_os=None, target_arch=None):