aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-07-26 07:31:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-07-26 07:31:56 +0000
commita09e1eeb5e8efdc58c4c922eb7b79e4a6b01e14f (patch)
tree186e7f5041ca32904acfce3b667922fa89047c70
parent18d12a68b1e3819c481624dd4a023e213ebf0aa0 (diff)
parentd8939f4ad11458d07e6da530c5862347cbaca9e5 (diff)
Merge "Add proxy in cloudify_ims" into stable/hunter
-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