Use lab local docker proxies

Change-Id: Ifb7821d6173d16ccb59053edd9eb53632fe65933
Issue-ID: INT-278
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 14b2725..7c371ec 100755 (executable)
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 sed -i '/#!\/bin\/bash/a\
+            mkdir -p /etc/docker\
+            cat > /etc/docker/daemon.json <<EOF\
+            {\
+              "insecure-registries" : ["stack.local.enacct.com:5000"]\
+            }\
+            EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
             Acquire::http { Proxy "http://stack.local.enacct.com:3142"; };\
             Acquire::https::Proxy "DIRECT";\

diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index d592b67..688cbac 100644 (file)
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -32,11 +32,11 @@ parameters:
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: nexus3.onap.org:10001
+  nexus_docker_repo: stack.local.enacct.com:5000
 
-  nexus_username: docker
+  nexus_username: anonymous
 
-  nexus_password: docker
+  nexus_password: anonymous
 
   dmaap_topic: AUTO
 

diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 6aa7c55..45c8ae0 100755 (executable)
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 sed -i '/#!\/bin\/bash/a\
+            mkdir -p /etc/docker\
+            cat > /etc/docker/daemon.json <<EOF\
+            {\
+              "insecure-registries" : ["docker-proxy.neo.futurewei.com:5000"]\
+            }\
+            EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
-            Acquire::http { Proxy "http://10.145.122.118:3142"; };\
+            Acquire::http { Proxy "http://apt-proxy.neo.futurewei.com:3142"; };\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1

diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index 61ba497..6dc01d5 100644 (file)
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -32,11 +32,11 @@ parameters:
 
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
-  nexus_docker_repo: nexus3.onap.org:10001
+  nexus_docker_repo: docker-proxy.neo.futurewei.com:5000
 
-  nexus_username: docker
+  nexus_username: anonymous
 
-  nexus_password: docker
+  nexus_password: anonymous
 
   dmaap_topic: AUTO