Merge "Change the default packages url from compass http server to opnfv artifacts"

6 files changed, 6 insertions, 8 deletions

diff --git a/build.sh b/build.sh
index ab81b8bc..800d627a 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ WORK_PATH=$COMPASS_PATH
 PACKAGES="fuse fuseiso createrepo genisoimage curl"
 
 # PACKAGE_URL will be reset in Jenkins for different branch
-export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999/master}
+export PACKAGE_URL=${PACKAGE_URL:-http://artifacts.opnfv.org/compass4nfv/package/master}
 
 mkdir -p $WORK_DIR
 
diff --git a/build/build.conf b/build/build.conf
index cb56e32a..101f01ba 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,8 +1,5 @@
 TIMEOUT=10
 
-# PACKAGE_URL will be reset in Jenkins for different branch
-#export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
-
 # Jumphost OS version
 export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
 
diff --git a/docs/release/installation/offline-deploy.rst b/docs/release/installation/offline-deploy.rst
index c854f87d..0acfa180 100644
--- a/docs/release/installation/offline-deploy.rst
+++ b/docs/release/installation/offline-deploy.rst
@@ -15,7 +15,8 @@ Preparation for offline deploy
     generated by script build.sh in compass4nfv root directory.)
 
 2.  Download the Jumphost preparation package from our httpserver. (Download the
-    jumphost environment package from `here <http://205.177.226.237:9999/jh_env_package.tar.gz>`_.
+    jumphost environment package from
+    `here <http://artifacts.opnfv.org/compass4nfv/package/master/jh_env_package.tar.gz>`_.
     It should be awared that currently we only support ubuntu trusty as offline
     jumphost OS.)
 
diff --git a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
index f2a14f48..7bec8878 100644
--- a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
+++ b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
@@ -65,7 +65,7 @@ rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb
 
 # Ubuntu16.04.1 LTS only have gcc-5-base_5.4.0-6ubuntu1~16.04.1, nova-novncproxy need
 # gcc-5-base_5.4.0-6ubuntu1~16.04.2, but the docker could not download gcc-5-base package.
-wget http://205.177.226.237:9999/nova-novncproxy_xenial_newton.tar.gz
+wget http://artifacts.opnfv.org/compass4nfv/package/master/nova-novncproxy_xenial_newton.tar.gz
 tar -zxvf nova-novncproxy_xenial_newton.tar.gz --strip-components 1 -C /var/cache/apt/
 
 mkdir deb
diff --git a/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh b/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
index 2095e0dc..1c43253b 100644
--- a/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
+++ b/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
@@ -21,7 +21,7 @@ apt-get install -y build-essential fakeroot debhelper \
 pushd .
 mkdir -p /home/package_yang/
 cd /home/package_yang
-wget http://205.177.226.237:9999/onosfw/package_ovs_debian.tar.gz
+wget http://artifacts.opnfv.org/compass4nfv/package/master/onosfw/package_ovs_debian.tar.gz
 tar -zxvf package_ovs_debian.tar.gz
 #wget http://openvswitch.org/releases/openvswitch-2.3.1.tar.gz
 #tar -zxvf openvswitch-2.3.1.tar.gz
diff --git a/repo/repo.conf b/repo/repo.conf
index 327e84d9..b688b80c 100644
--- a/repo/repo.conf
+++ b/repo/repo.conf
@@ -12,7 +12,7 @@ TIMEOUT=100
 #export MAKE_ALL=${MAKE_ALL:-"false"}
 export JUMP_HOST="trusty"
 # PACKAGE_URL will be reset in Jenkins for different branch
-export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
+export PACKAGE_URL=${PACKAGE_URL:-http://artifacts.opnfv.org/compass4nfv/package/master}
 
 # feature packages
 export KVMFORNFV=${kvmfornfv:-https://gerrit.opnfv.org/gerrit/p/kvmfornfv.git}