On Thu, 06/28 12:35, Philippe Mathieu-Daudé wrote:
> If ftp_proxy/http_proxy/https_proxy standard environment variables
> are available, pass them to the vm images.
>
> As per 06cc3551714:
> This is required when building behind corporate proxy/firewall, but
> also help when using local cache server (ie: apt/yum).
>
> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> tests/vm/ubuntu.i386 | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386
> index fc319e0e6e..be16ceed50 100755
> --- a/tests/vm/ubuntu.i386
> +++ b/tests/vm/ubuntu.i386
> @@ -68,6 +68,10 @@ class UbuntuX86VM(basevm.BaseVM):
> 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")
> + for k, v in os.environ.iteritems():
> + kl = k.lower()
> + if kl in ['ftp_proxy', 'http_proxy', 'https_proxy']:
> + self.ssh_root_check("echo 'Acquire::{}::Proxy \"{}\";' >>
> /etc/apt/apt.conf.d/01proxy".format(kl[:-6].upper(), v))
Reasonable, but do we want it for other apps and images? How about setting these
env vars to ssh commands?
Fam
> self.ssh_root_check("apt-get update")
> self.ssh_root_check("apt-get install -y cloud-initramfs-growroot")
> # Don't check the status in case the guest hang up too quickly
> --
> 2.18.0
>
