| Message ID | 20190211130507.8710-1-alex.bennee@linaro.org |
|---|---|
| Headers | show |
| Series | testing updates: travis/cirrus/vm-test/binfmt | expand |
On 2/11/19 2:05 PM, Alex Bennée wrote: > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > Depending of the host hardware, copying and extracting VM images can > take up to few minutes. Add verbosity to avoid the user to worry about > VMs hanging. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> This one had: Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Message-Id: <20190129175403.18017-2-philmd@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > diff --git a/tests/vm/centos b/tests/vm/centos > index daa2dbca03..ba133ea429 100755 > --- a/tests/vm/centos > +++ b/tests/vm/centos > @@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): > def build_image(self, img): > 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", "-df", img_tmp + ".xz"]) > + subprocess.check_call(["xz", "-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 1d64c31b7c..b0066017a6 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -33,8 +33,9 @@ class FreeBSDVM(basevm.BaseVM): > sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891') > 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", "-df", img_tmp_xz]) > + subprocess.check_call(["xz", "-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 a2c3d13af4..4c6624ea5e 100755 > --- a/tests/vm/netbsd > +++ b/tests/vm/netbsd > @@ -33,8 +33,9 @@ class NetBSDVM(basevm.BaseVM): > sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') > 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", "-df", img_tmp_xz]) > + subprocess.check_call(["xz", "-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 cfe0572c59..2105c01a26 100755 > --- a/tests/vm/openbsd > +++ b/tests/vm/openbsd > @@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): > sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf') > 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", "-df", img_tmp_xz]) > + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) > if os.path.exists(img): > os.remove(img) > os.rename(img_tmp, img) >
On Mon, 11 Feb 2019 at 13:05, Alex Bennée <alex.bennee@linaro.org> wrote: > > The following changes since commit e47f81b617684c4546af286d307b69014a83538a: > > Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging (2019-02-07 18:53:25 +0000) > > are available in the Git repository at: > > https://github.com/stsquad/qemu.git tags/pull-testing-next-110219-1 > > for you to fetch changes up to 920fff9093db26f3e74858e3d4182b74a6da7496: > > tests/vm: Be verbose while extracting compressed images (2019-02-11 12:47:08 +0000) > > ---------------------------------------------------------------- > Testing updates: > > - .travis.yml tweaks and optimisations > - .cirrus.yml enabled for FreeBSD CI > - docker.py clean-ups for binfmt_misc > - more control of vm-test builds > Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0 for any user-visible changes. -- PMM
The following changes since commit e47f81b617684c4546af286d307b69014a83538a: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging (2019-02-07 18:53:25 +0000) are available in the Git repository at: https://github.com/stsquad/qemu.git tags/pull-testing-next-110219-1 for you to fetch changes up to 920fff9093db26f3e74858e3d4182b74a6da7496: tests/vm: Be verbose while extracting compressed images (2019-02-11 12:47:08 +0000) ---------------------------------------------------------------- Testing updates: - .travis.yml tweaks and optimisations - .cirrus.yml enabled for FreeBSD CI - docker.py clean-ups for binfmt_misc - more control of vm-test builds ---------------------------------------------------------------- Alex Bennée (11): .travis.yml: separate tools and docs into another entry .travis.yml: fold --disable-tcg into alternate coroutine builds docker: add debian-buster-arm64-cross tests: make docker.py update use configured binfmt path tests: make docker.py check for persistent configs tests: docker.py be even smarter with persistent binfmt_misc tests: PEP8 cleanup of docker.py, mostly white space tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386 tests/vm: add --build-target option tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS scripts/qemu.py: allow arches use KVM for their 32bit cousins Daniel P. Berrangé (1): .travis.yml: stop requesting libffi & gettext from homebrew Ed Maste (1): .cirrus.yml: basic compile and test for FreeBSD Gerd Hoffmann (1): tests/vm: move images to $HOME/.cache/qemu-vm/images Murilo Opsfelder Araujo (1): docs/devel/testing: Add -a option to usermod command on docker setup Philippe Mathieu-Daudé (3): MAINTAINERS: Add an entry for scripts/archive-source.sh archive-source.sh: Clone the submodules locally tests/vm: Be verbose while extracting compressed images .cirrus.yml | 16 +++ .travis.yml | 31 +++--- MAINTAINERS | 9 ++ docs/devel/testing.rst | 2 +- scripts/archive-source.sh | 7 ++ scripts/qemu.py | 12 ++- tests/docker/Makefile.include | 1 + tests/docker/docker.py | 110 +++++++++++++++------ .../dockerfiles/debian-buster-arm64-cross.docker | 15 +++ tests/docker/dockerfiles/debian10.docker | 31 ++++++ tests/tcg/aarch64/Makefile.include | 2 +- tests/vm/Makefile.include | 22 +++-- tests/vm/basevm.py | 3 + tests/vm/centos | 3 +- tests/vm/freebsd | 6 +- tests/vm/netbsd | 6 +- tests/vm/openbsd | 3 +- tests/vm/ubuntu.i386 | 3 +- 18 files changed, 222 insertions(+), 60 deletions(-) create mode 100644 .cirrus.yml create mode 100644 tests/docker/dockerfiles/debian-buster-arm64-cross.docker create mode 100644 tests/docker/dockerfiles/debian10.docker -- 2.20.1