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

JIRA: COMPASS-544

Currently compass4nfv uses compass http server to store those packages used in
building ISO. This is not propriate in OPNFV community. So we push all the packages
into opnfv artifacts repo and change the package url used in compass to opnfv
artifacts repo url.

Change-Id: I9661f2d893767e18c037ba9de5f54933f48ce466
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
(cherry picked from commit 5cee19684b16e80b131cc3b5441781a3c6a7f971)

diff --git a/build.sh b/build.sh
index ab81b8b..800d627 100755 (executable)
--- 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 cb56e32..101f01b 100644 (file)
--- 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 c854f87..0acfa18 100644 (file)
--- 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 f2a14f4..7bec887 100644 (file)
--- 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 2095e0d..1c43253 100644 (file)
--- 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 327e84d..b688b80 100644 (file)
--- 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}