From: Thierry ALLENO <thierry.alleno@orange.com>
Date: Wed, 24 Jul 2019 09:36:42 +0000 (+0200)
Subject: Add proxy in cloudify_ims
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F68258%2F1;p=functest.git

Add proxy in cloudify_ims

Add http-proxy configuration for pip in cloudify_ims testcase.
Correct some errors.

Change-Id: I980fc78f48c5be5d6166388f8b72f40cb613162c
Signed-off-by: Thierry ALLENO <thierry.alleno@orange.com>
---

diff --git a/functest/ci/add_proxy.sh b/functest/ci/add_proxy.sh
index a3270b136..082141073 100644
--- a/functest/ci/add_proxy.sh
+++ b/functest/ci/add_proxy.sh
@@ -74,6 +74,13 @@ http-proxy-port = "${http_proxy_port}"
 EOF
 }
 
+add_proxy_pip ()  {
+    cat << EOF >> "$1"
+[global]
+proxy="${http_proxy}"
+EOF
+}
+
 tmpdir=$(mktemp -d)
 for image in $images; do
     if [ ! -f "$image" ]; then
@@ -88,8 +95,9 @@ for image in $images; do
         add_proxy_juju_systemd "${tmpdir}/etc/juju-proxy-systemd.conf"
         mkdir -p ${tmpdir}/root/.m2
         mkdir -p ${tmpdir}/root/.subversion
-        add_proxy_maven "${tmpdir}/root/.m2/settings.xml}"
-        add_proxy_svn "${tmpdir}/root/.subversion/servers}"
+        add_proxy_maven "${tmpdir}/root/.m2/settings.xml"
+        add_proxy_svn "${tmpdir}/root/.subversion/servers"
+        add_proxy_pip "${tmpdir}/etc/pip.conf"
     fi
     guestunmount "${tmpdir}"
 done