aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-01-09 19:54:45 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-01-10 20:23:29 +0000
commit5e8e8128b2cbb961e138704f791326e8d0d974e1 (patch)
tree0e78e7bbaba9722e8fef164f16ad86a74600f3b7
parentd83efffdf04f9829347c6fd5f6b84e005e0bb4a0 (diff)
Use lab local docker proxies
Change-Id: Ifb7821d6173d16ccb59053edd9eb53632fe65933 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com> (cherry picked from commit f58cbcbc8603db69e1bac6b34d1d5aaf88470471)
-rwxr-xr-xtest/ete/labs/gwu/apt-proxy.sh6
-rw-r--r--test/ete/labs/gwu/onap-openstack-template.env6
-rwxr-xr-xtest/ete/labs/huawei/apt-proxy.sh8
-rw-r--r--test/ete/labs/huawei/onap-openstack-template.env4
4 files changed, 18 insertions, 6 deletions
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index 14b272566..7c371ec24 100755
--- 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 d592b6774..688cbacc9 100644
--- 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 6aa7c5578..45c8ae09b 100755
--- 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 a055b2b16..8a7338a39 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -34,9 +34,9 @@ parameters:
nexus_docker_repo: docker-proxy.neo.futurewei.com:5000
- nexus_username: docker
+ nexus_username: anonymous
- nexus_password: docker
+ nexus_password: anonymous
dmaap_topic: AUTO