diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-26 20:43:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-26 20:43:46 +0000 |
| commit | be5430260856bcbb2dbb162caa6369218637fd6d (patch) | |
| tree | 2ba65f81a7ae16d8847a3b808ed009ba05182666 | |
| parent | e0d79c9435c60d7637a49083a5789471b1b70bdb (diff) | |
| parent | b3b9a433b0691b73c96d9ea4de67fe9c8ea293e8 (diff) | |
| download | qemu-be5430260856bcbb2dbb162caa6369218637fd6d.zip qemu-be5430260856bcbb2dbb162caa6369218637fd6d.tar.gz qemu-be5430260856bcbb2dbb162caa6369218637fd6d.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-rc3-testing-261119-1' into staging
A few vm-test updates
- use Ubuntu 18.04 for i386 image
- python3 for centos and docker
- install locales for ubuntu
# gpg: Signature made Tue 26 Nov 2019 11:31:26 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-rc3-testing-261119-1:
tests/vm/ubuntu: update i386 image to 18.04
tests/vm/ubuntu: include language pack to silence locale warnings
tests/vm/centos: fix centos build target
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | tests/vm/centos | 2 | ||||
| -rwxr-xr-x | tests/vm/ubuntu.i386 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/vm/centos b/tests/vm/centos index 53976f1..b9e851f 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -73,7 +73,7 @@ class CentosVM(basevm.BaseVM): self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("yum update -y") - self.ssh_root_check("yum install -y docker make git") + self.ssh_root_check("yum install -y docker make git python3") self.ssh_root_check("systemctl enable docker") self.ssh_root("poweroff") self.wait() diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 38f740e..f611bebd 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -66,8 +66,8 @@ class UbuntuX86VM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache( - "https://cloud-images.ubuntu.com/releases/16.04/release-20190605/ubuntu-16.04-server-cloudimg-i386-disk1.img", - sha256sum="e30091144c73483822b7c27193e9d47346dd1064229da577c3fedcf943f7cfcc") + "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img", + sha256sum="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef") img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) @@ -84,7 +84,7 @@ class UbuntuX86VM(basevm.BaseVM): self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list") self.ssh_root_check("apt-get update") self.ssh_root_check("apt-get build-dep -y qemu") - self.ssh_root_check("apt-get install -y libfdt-dev flex bison") + self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en") self.ssh_root("poweroff") self.wait() os.rename(img_tmp, img) |