diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-04-11 21:06:20 +0800 |
|---|---|---|
| committer | Yifei Xue <xueyifei@huawei.com> | 2017-05-10 01:43:19 +0000 |
| commit | f0f025b1137da4ab12b0db76620c332fac3335bc (patch) | |
| tree | e824e6b0431420ed908569ab74cedfe0efe1344b /repo | |
| parent | c1c6026466942ef01174e639eccc7a5b51797107 (diff) | |
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)
Diffstat (limited to 'repo')
| -rw-r--r-- | repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl | 2 | ||||
| -rw-r--r-- | repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh | 2 | ||||
| -rw-r--r-- | repo/repo.conf | 2 |
3 files changed, 3 insertions, 3 deletions
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} |