Add proxy in cloudify_ims 53/68253/10
authorThierry ALLENO <thierry.alleno@orange.com>
Tue, 23 Jul 2019 15:14:37 +0000 (17:14 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Sat, 27 Jul 2019 09:30:39 +0000 (11:30 +0200)
Add http-proxy configuration for pip in cloudify_ims testcase.
Correct some errors.

Change-Id: Ie09e1339536fd347ba0921e861474fecaf0876e4
Signed-off-by: Thierry ALLENO <thierry.alleno@orange.com>
functest/ci/add_proxy.sh

index a3270b1..0821410 100644 (file)
@@ -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