aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Closset <cc697w@intl.att.com>2018-04-09 16:01:32 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-09 16:01:32 +0000
commitb0eb31c5a030c2419a90d4fb82cdef5ecbacc94c (patch)
tree2b0311b2cc67fa23916d47f1f78b309bc2c09b64
parent2a4e0569bc3250b0c8f8cc97a69ea6baed9dc68d (diff)
parent885d7c164e99e069c9a6c2827e479e1d8fee616e (diff)
Merge "Fix python script"
-rw-r--r--pom.xml4
-rwxr-xr-xsrc/test/resources/http-cache/start_http_cache.sh7
2 files changed, 6 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 10497d18..e023994e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<skip.docker.build>true</skip.docker.build>
<skip.docker.push>true</skip.docker.push>
<skip.staging.artifacts>false</skip.staging.artifacts>
- <http.proxy></http.proxy>
+ <python.http.proxy.param></python.http.proxy.param>
</properties>
<distributionManagement>
@@ -830,7 +830,7 @@
</ports>
<workingDir>/usr/src/http-cache-app</workingDir>
<cmd>
- <shell>./start_http_cache.sh ${http.proxy} --python_proxyaddress localhost:${docker.http-cache.port.host}</shell>
+ <shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
</cmd>
</run>
</image>
diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh
index 0f32c93a..fb4975e5 100755
--- a/src/test/resources/http-cache/start_http_cache.sh
+++ b/src/test/resources/http-cache/start_http_cache.sh
@@ -22,17 +22,18 @@
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
###
+echo "Starting HTTP CACHE python script"
for i in "$@"
do
case $i in
- --python_proxyaddress=*)
+ --python_proxyaddress=*)
python_proxyaddress="--proxyaddress ${i#*=}"
echo "- Using python_proxyaddress and set it to: $python_proxyaddress"
shift # past argument=value
;;
- --http_proxyaddress=*)
+ --http_proxyaddress=*)
export http_proxy="${i#*=}"
- export https_proxy=$http_proxy
+ export https_proxy="${i#*=}"
echo "- Defining http_proxy/https_proxy env variables to: $http_proxy"
shift # past argument=value
;;