From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 26 Apr 2018 17:03:56 +0000 (-0700)
Subject: Allow DCAE to use local docker proxy
X-Git-Tag: sniroemulator-1.0.0~116^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6ca661c66c1e8f68a96e2ae4e8bf90ef2d2b3414;p=integration.git

Allow DCAE to use local docker proxy

Change-Id: I7bd8721400ee18ecef482eba28287ffc2aa67698
Issue-ID: INT-278
Issue-ID: INT-414
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index d69415bd8..e1c4f0891 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -13,6 +13,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 37018ca6b..b95299302 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh
index f2094ee2f..3cf547452 100755
--- a/test/ete/labs/tlab/apt-proxy.sh
+++ b/test/ete/labs/tlab/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh
index 54b15bba6..365b5d015 100755
--- a/test/ete/labs/windriver/apt-proxy.sh
+++ b/test/ete/labs/windriver/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1