mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
A few vm-test updates
- use Ubuntu 18.04 for i386 image - python3 for centos and docker - install locales for ubuntu -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl3dDQ4ACgkQ+9DbCVqe KkRERQf/UasMmLybcKQwfyXTemk0D0O7IW2Nb2PNg+6i/BWXm4WfNCVQOizZFDLV PWq0K7OyRWzzsCjD4r6by8hkDkygBDu6kJE2kmuojhj/g1RHQNf4vmJDMCYbVt64 mfEbqOCpyGWbTfaUoLZWoc6La+QsAPqwMy02NIGDrSZvuD7VUyjNssfSa/UgUIvy h8XiRz5ObRijpr7p59G2IJfvvz4Lp1X1mKzhjzjQUsFbWx75jiWp0f0WpBDbPEBA nSVOC/lvGQDvfJjZsk04VmkbkKXmGIYn53pWSacSKZDZTS8Eg5xT6dhpnhlPPzQD 82upUJbvEfQEUVwlLuZo1YBPV0QfUw== =xNjo -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
be54302608
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue