summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelen Chen <helen.chen@huawei.com>2018-04-30 19:31:41 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-30 19:31:41 +0000
commit94a310eddc8fd92bceab49f32398b667804c45e2 (patch)
tree26ff687f035596e393651f2cbeb9d92eb1639db1
parent570a18a7b7a7022c113237c6c14af097fac5ca3e (diff)
parent6ca661c66c1e8f68a96e2ae4e8bf90ef2d2b3414 (diff)
Merge "Allow DCAE to use local docker proxy"
-rwxr-xr-xtest/ete/labs/gwu/apt-proxy.sh3
-rwxr-xr-xtest/ete/labs/huawei/apt-proxy.sh3
-rwxr-xr-xtest/ete/labs/tlab/apt-proxy.sh3
-rwxr-xr-xtest/ete/labs/windriver/apt-proxy.sh3
4 files changed, 0 insertions, 12 deletions
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