| Message ID | 20190619194021.8240-2-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next (Travis fixes, more tests/vm) | expand |
On 6/19/19 9:40 PM, Alex Bennée wrote: > From: Cleber Rosa <crosa@redhat.com> > > The image copy is only really needed because xz doesn't know to > properly decompress a file not named properly. Instead of > decompressing to stdout, and having to rely on a shell, let's just > create a link instead of copying the file. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Message-Id: <20190613130718.3763-2-crosa@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/vm/centos | 4 ++-- > tests/vm/freebsd | 4 ++-- > tests/vm/netbsd | 4 ++-- > tests/vm/openbsd | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tests/vm/centos b/tests/vm/centos > index 7417b50af4..b00b46a8dc 100755 > --- a/tests/vm/centos > +++ b/tests/vm/centos > @@ -66,8 +66,8 @@ class CentosVM(basevm.BaseVM): > cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") > img_tmp = img + ".tmp" > sys.stderr.write("Extracting the image...\n") > - subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) > - subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) > + subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) > + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) > subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) > self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) > self.wait_ssh() > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index b0066017a6..5575c23a6f 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -34,8 +34,8 @@ class FreeBSDVM(basevm.BaseVM): > img_tmp_xz = img + ".tmp.xz" > img_tmp = img + ".tmp" > sys.stderr.write("Extracting the image...\n") > - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) > - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) > + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) > + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) > if os.path.exists(img): > os.remove(img) > os.rename(img_tmp, img) > diff --git a/tests/vm/netbsd b/tests/vm/netbsd > index 4c6624ea5e..d0508f4465 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -34,8 +34,8 @@ class NetBSDVM(basevm.BaseVM): > img_tmp_xz = img + ".tmp.xz" > img_tmp = img + ".tmp" > sys.stderr.write("Extracting the image...\n") > - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) > - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) > + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) > + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) > if os.path.exists(img): > os.remove(img) > os.rename(img_tmp, img) > diff --git a/tests/vm/openbsd b/tests/vm/openbsd > index 2105c01a26..87ec982489 100755 > --- a/tests/vm/openbsd > +++ b/tests/vm/openbsd > @@ -36,8 +36,8 @@ class OpenBSDVM(basevm.BaseVM): > img_tmp_xz = img + ".tmp.xz" > img_tmp = img + ".tmp" > sys.stderr.write("Extracting the image...\n") > - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) > - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) > + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) > + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) > if os.path.exists(img): > os.remove(img) > os.rename(img_tmp, img) >
diff --git a/tests/vm/centos b/tests/vm/centos index 7417b50af4..b00b46a8dc 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -66,8 +66,8 @@ class CentosVM(basevm.BaseVM): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) + subprocess.check_call(["ln", "-f", cimg, img_tmp + ".xz"]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh() diff --git a/tests/vm/freebsd b/tests/vm/freebsd index b0066017a6..5575c23a6f 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -34,8 +34,8 @@ class FreeBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 4c6624ea5e..d0508f4465 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -34,8 +34,8 @@ class NetBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 2105c01a26..87ec982489 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -36,8 +36,8 @@ class OpenBSDVM(basevm.BaseVM): img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" sys.stderr.write("Extracting the image...\n") - subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-dvf", img_tmp_xz]) + subprocess.check_call(["ln", "-f", cimg, img_tmp_xz]) + subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)