aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry ALLENO <thierry.alleno@orange.com>2019-07-23 17:14:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-07-27 11:30:39 +0200
commit45423d891d0810e9a495a6506b700670e5271d03 (patch)
tree58cc127804bde9d38a9415d1628591656ee6f69b
parent7857e71b783ce037d0ff5239f20315c445f91dc5 (diff)
Add proxy in cloudify_ims
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>
-rw-r--r--functest/ci/add_proxy.sh12
1 files changed, 10 insertions, 2 deletions
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