| Message ID | 20240726134438.14720-12-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Bump Avocado to 103.0 LTS and update tests for compatibility and new features | expand |
On Fri, Jul 26, 2024 at 09:44:36AM -0400, Cleber Rosa wrote: > When the OpenBSD based tests are run in parallel, the previously > single instance of the image would become corrupt. Let's give each > test its own copy. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/avocado/machine_aarch64_sbsaref.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py > index 1275f24532..8816308b86 100644 > --- a/tests/avocado/machine_aarch64_sbsaref.py > +++ b/tests/avocado/machine_aarch64_sbsaref.py > @@ -7,6 +7,7 @@ > # SPDX-License-Identifier: GPL-2.0-or-later > > import os > +import shutil > > from avocado import skipUnless > from avocado.utils import archive > @@ -187,7 +188,9 @@ def boot_openbsd73(self, cpu): > ) > > img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5" > - img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash) > + cached_img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash) > + img_path = os.path.join(self.workdir, os.path.basename(cached_img_path)) > + shutil.copy(cached_img_path, img_path) Again I think we should be using a throwaway qcow2 overlay rather than copying the full image. > > self.vm.set_console() > self.vm.add_args( With regards, Daniel
diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 1275f24532..8816308b86 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -7,6 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later import os +import shutil from avocado import skipUnless from avocado.utils import archive @@ -187,7 +188,9 @@ def boot_openbsd73(self, cpu): ) img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5" - img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash) + cached_img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash) + img_path = os.path.join(self.workdir, os.path.basename(cached_img_path)) + shutil.copy(cached_img_path, img_path) self.vm.set_console() self.vm.add_args(
When the OpenBSD based tests are run in parallel, the previously single instance of the image would become corrupt. Let's give each test its own copy. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/avocado/machine_aarch64_sbsaref.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)