On Thu, 07/12 12:02, Philippe Mathieu-Daudé wrote:
> Hi Fam,
>
> On 07/11/2018 10:28 PM, Fam Zheng wrote:
> > This one does docker testing in the VM. It is intended to replace the
> > native docker testing on patchew testers.
> >
> > Signed-off-by: Fam Zheng <f...@redhat.com>
> > ---
> > tests/vm/Makefile.include | 3 +-
> > tests/vm/centos | 84 +++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 86 insertions(+), 1 deletion(-)
> > create mode 100755 tests/vm/centos
> >
> > diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
> > index 5daa2a3b73..af19b7a4e6 100644
> > --- a/tests/vm/Makefile.include
> > +++ b/tests/vm/Makefile.include
> > @@ -2,7 +2,7 @@
> >
> > .PHONY: vm-build-all
> >
> > -IMAGES := ubuntu.i386 freebsd netbsd openbsd
> > +IMAGES := ubuntu.i386 freebsd netbsd openbsd centos
> > IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES))
> >
> > .PRECIOUS: $(IMAGE_FILES)
> > @@ -14,6 +14,7 @@ vm-test:
> > @echo " vm-build-freebsd - Build QEMU in FreeBSD VM"
> > @echo " vm-build-netbsd - Build QEMU in NetBSD VM"
> > @echo " vm-build-openbsd - Build QEMU in OpenBSD VM"
> > + @echo " vm-build-centos - Build QEMU in CentOS VM,
> > with Docker"
> >
> > vm-build-all: $(addprefix vm-build-, $(IMAGES))
> >
> > diff --git a/tests/vm/centos b/tests/vm/centos
> > new file mode 100755
> > index 0000000000..afd560c564
> > --- /dev/null
> > +++ b/tests/vm/centos
> > @@ -0,0 +1,84 @@
> > +#!/usr/bin/env python
> > +#
> > +# CentOS image
> > +#
> > +# Copyright 2018 Red Hat Inc.
> > +#
> > +# Authors:
> > +# Fam Zheng <f...@redhat.com>
> > +#
> > +# This code is licensed under the GPL version 2 or later. See
> > +# the COPYING file in the top-level directory.
> > +#
> > +
> > +import os
> > +import sys
> > +import subprocess
> > +import basevm
> > +import time
> > +
> > +class CentosVM(basevm.BaseVM):
> > + name = "centos"
> > + BUILD_SCRIPT = """
> > + set -e;
> > + cd $(mktemp -d);
> > + export SRC_ARCHIVE=/dev/vdb;
> > + sudo chmod a+r $SRC_ARCHIVE;
> > + tar -xf $SRC_ARCHIVE;
> > + make docker-test-block@centos7 V={verbose} J={jobs};
> > + make docker-test-quick@centos7 V={verbose} J={jobs};
> > + make docker-test-mingw@fedora V={verbose} J={jobs};
> > + """
> > +
> > + def _gen_cloud_init_iso(self):
> > + cidir = self._tmpdir
> > + mdata = open(os.path.join(cidir, "meta-data"), "w")
> > + mdata.writelines(["instance-id: centos-vm-0\n",
> > + "local-hostname: centos-guest\n"])
> > + mdata.close()
> > + udata = open(os.path.join(cidir, "user-data"), "w")
> > + udata.writelines(["#cloud-config\n",
> > + "chpasswd:\n",
> > + " list: |\n",
> > + " root:%s\n" % self.ROOT_PASS,
> > + " %s:%s\n" % (self.GUEST_USER,
> > self.GUEST_PASS),
> > + " expire: False\n",
> > + "users:\n",
> > + " - name: %s\n" % self.GUEST_USER,
> > + " sudo: ALL=(ALL) NOPASSWD:ALL\n",
> > + " ssh-authorized-keys:\n",
> > + " - %s\n" % basevm.SSH_PUB_KEY,
> > + " - name: root\n",
> > + " ssh-authorized-keys:\n",
> > + " - %s\n" % basevm.SSH_PUB_KEY,
> > + "locale: en_US.UTF-8\n"])
> > + udata.close()
> > + subprocess.check_call(["genisoimage", "-output", "cloud-init.iso",
> > + "-volid", "cidata", "-joliet", "-rock",
> > + "user-data", "meta-data"],
> > + cwd=cidir,
> > + stdin=self._devnull, stdout=self._stdout,
> > + stderr=self._stdout)
> > + return os.path.join(cidir, "cloud-init.iso")
> > +
> > + 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"
> > + subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"])
> > + subprocess.check_call(["xz", "-df", 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()
> > + self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
>
> Here I had to add:
>
> for k, v in os.environ.iteritems():
> if k.lower() == "http_proxy":
> self.ssh_root_check("echo 'proxy=" + v + "' >> /etc/yum.conf")
>
> I understood we will fix this corporate firewall issue later in basevm,
> still I couldn't test your series without.
Could you test this patch?
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 25361c6b7d..4bc1a657d3 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -106,7 +106,10 @@ class BaseVM(object):
if interactive:
ssh_cmd += ['-t']
assert not isinstance(cmd, str)
- ssh_cmd += ["%s@127.0.0.1" % user] + list(cmd)
+ env_names = ['ftp_proxy', 'http_proxy', 'https_proxy']
+ envs = ["%s=%s" % (k, v) for k, v in os.environ.items() \
+ if k.lower() in env_names]
+ ssh_cmd += ["%s@127.0.0.1" % user] + envs + list(cmd)
logging.debug("ssh_cmd: %s", " ".join(ssh_cmd))
r = subprocess.call(ssh_cmd)
if check and r != 0:
