Merge "Create make_repo directory and optimize the current repo making related script"

1 files changed, 3 insertions, 81 deletions

diff --git a/build/build.conf b/build/build.conf
index f9e40568..0cd12557 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,7 +1,7 @@
 TIMEOUT=10
 
 # 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://205.177.226.237:9999}
 
 # Jumphost OS version
 export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
@@ -28,7 +28,7 @@ export UBUNTU_ISO1=${UBUNTU_ISO1:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
 export TRUSTY_LIBERTY_PPA=${TRUSTY_LIBERTY_PPA:-$PACKAGE_URL/trusty-liberty-ppa.tar.gz}
 export TRUSTY_MITAKA_PPA=${TRUSTY_MITAKA_PPA:-$PACKAGE_URL/trusty-mitaka-ppa.tar.gz}
 export XENIAL_MITAKA_PPA=${XENIAL_MITAKA_PPA:-$PACKAGE_URL/xenial-mitaka-ppa.tar.gz}
-export XENIAL_NEWTON_PPA=${XENIAL_NEWTON_PPA:-$PACKAGE_URL/xenial-newton-ppa.tar.gz}
+export XENIAL_NEWTON_PPA=${XENIAL_NEWTON_PPA:-$PPA_URL/xenial-newton-ppa.tar.gz}
 #export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
 #export CENTOS7_KILO_PPA=${CENTOS7_KILO_PPA:-$PACKAGE_URL/centos7-kilo-ppa.tar.gz}
 export CENTOS7_LIBERTY_PPA=${CENTOS7_LIBERTY_PPA:-$PACKAGE_URL/centos7-liberty-ppa.tar.gz}
@@ -36,86 +36,8 @@ export CENTOS7_MITAKA_PPA=${CENTOS7_MITAKA_PPA:-$PACKAGE_URL/centos7-mitaka-ppa.
 # export REDHAT7_OSP9_PPA=${REDHAT7_OSP9_PPA:-$PACKAGE_URL/redhat7-osp9-ppa.tar.gz}
 
 # SDN Packages for integration
-export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
+export APP_PACKAGE=${APP_PACKAGE:-$FEATURE_URL/packages.tar.gz}
 
 # Other Packages
 export LOADERS=${LOADERS:-$PACKAGE_URL/loaders.tar.gz}
 export CIRROS=${CIRROS:-$PACKAGE_URL/cirros-0.3.3-x86_64-disk.img}
-export SPECIAL_DEBIAN_PACKAGE=${SPECIAL_DEBIAN_PACKAGE-$PACKAGE_URL/debian-packages.tar.gz}
-export KVMFORNFV=${kvmfornfv:-https://gerrit.opnfv.org/gerrit/p/kvmfornfv.git}
-
-
-export SPECIAL_PIP_PACKAGE="https://bootstrap.pypa.io/ez_setup.py \
-    https://pypi.python.org/packages/source/s/setuptools/setuptools-18.2.zip \
-    https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz \
-    https://pypi.python.org/packages/source/a/ansible/ansible-1.9.2.tar.gz \
-    https://pypi.python.org/packages/source/v/virtualenv/virtualenv-13.1.2.tar.gz \
-    https://pypi.python.org/packages/source/p/pexpect/pexpect-3.3.tar.gz \
-    https://pypi.python.org/packages/source/a/amqplib/amqplib-1.0.2.tgz \
-    https://pypi.python.org/packages/source/M/Markdown/Markdown-2.4.tar.gz \
-    https://pypi.python.org/packages/source/C/Cheetah/Cheetah-2.4.1.tar.gz \
-    https://pypi.python.org/packages/source/d/daemon/daemon-1.1.tar.gz \
-    https://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz \
-    https://pypi.python.org/packages/source/F/Flask-Login/Flask-Login-0.2.11.tar.gz \
-    https://pypi.python.org/packages/2.7/F/Flask-RESTful/Flask_RESTful-0.3.4-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/2.7/F/Flask-WTF/Flask_WTF-0.12-py2-none-any.whl \
-    https://pypi.python.org/packages/source/i/importlib/importlib-1.0.3.tar.bz2 \
-    https://pypi.python.org/packages/py2/l/lockfile/lockfile-0.10.2-py2-none-any.whl \
-    https://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-1.2.5.zip \
-    https://pypi.python.org/packages/any/n/netaddr/netaddr-0.7.18-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/P/PyChef/PyChef-0.2.3.tar.gz \
-    https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.0.8.tar.gz \
-    https://pypi.python.org/packages/source/s/simplejson/simplejson-3.8.0.tar.gz \
-    https://pypi.python.org/packages/2.7/r/requests/requests-2.7.0-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/2.7/c/celery/celery-3.1.18-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/2.7/W/Werkzeug/Werkzeug-0.10.4-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/c/ciso8601/ciso8601-1.0.1.tar.gz \
-    https://pypi.python.org/packages/3.3/s/six/six-1.9.0-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/2.7/W/WTForms/WTForms-2.0.2-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/d/docutils/docutils-0.12.tar.gz \
-    https://pypi.python.org/packages/2.7/a/amqp/amqp-1.4.6-py2-none-any.whl \
-    https://pypi.python.org/packages/any/M/Markdown/Markdown-2.6.2-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/2.7/a/argparse/argparse-1.3.0-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/F/Flask-Script/Flask-Script-2.0.5.tar.gz \
-    https://pypi.python.org/packages/source/F/Flask-SQLAlchemy/Flask-SQLAlchemy-0.10.tar.gz \
-    https://pypi.python.org/packages/source/l/lazypy/lazypy-0.2.tar.gz \
-    https://pypi.python.org/packages/source/p/pytz/pytz-2014.3.zip \
-    https://pypi.python.org/packages/source/b/billiard/billiard-3.3.0.3.tar.gz \
-    https://pypi.python.org/packages/source/a/anyjson/anyjson-0.1.tar.gz \
-    https://pypi.python.org/packages/2.7/k/kombu/kombu-3.0.17-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/a/aniso8601/aniso8601-0.48.tar.gz \
-    https://pypi.python.org/packages/2.7/e/ecdsa/ecdsa-0.12-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.1.tar.gz \
-    https://pypi.python.org/packages/source/i/itsdangerous/itsdangerous-0.24.tar.gz \
-    https://pypi.python.org/packages/source/p/paramiko/paramiko-1.12.3.tar.gz \
-    https://pypi.python.org/packages/3.4/p/python-daemon/python_daemon-2.0.4-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/r/redis/redis-2.7.1.tar.gz \
-    https://pypi.python.org/packages/source/b/billiard/billiard-3.3.0.20.tar.gz \
-    https://pypi.python.org/packages/2.7/k/kombu/kombu-3.0.26-py2.py3-none-any.whl \
-    https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.8.tar.gz \
-    https://pypi.python.org/packages/source/a/aniso8601/aniso8601-0.85.tar.gz \
-    https://pypi.python.org/packages/source/a/anyjson/anyjson-0.3.3.tar.gz \
-    https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.0.tar.gz \
-    https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.23.tar.gz \
-    https://pypi.python.org/packages/source/l/lazypy/lazypy-0.5.tar.gz \
-    https://pypi.python.org/packages/source/p/pycrypto-on-pypi/pycrypto-on-pypi-2.3.tar.gz \
-    https://pypi.python.org/packages/source/p/pymongo/pymongo-3.0.3.tar.gz \
-    https://pypi.python.org/packages/source/c/crudini/crudini-0.7.tar.gz \
-    https://pypi.python.org/packages/source/n/networking-odl/networking-odl-1.0.1.tar.gz \
-    https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.715.tar.gz \
-    https://pypi.python.org/packages/source/p/pyasn1/pyasn1-0.1.9.tar.gz \
-    https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.1.tar.gz \
-    https://pypi.python.org/packages/source/c/cliff/cliff-1.15.0.tar.gz \
-    https://pypi.python.org/packages/6e/96/ba2a2462ed25ca0e651fb7b66e7080f5315f91425a07ea5b34d7c870c114/Babel-2.3.4.tar.gz \
-    https://pypi.python.org/packages/93/ba/7be92c44a984ff23bc13fa4dfffe01422cfd343b09ada7356bb16bae4ef7/tosca-parser-0.5.0.tar.gz \
-    https://pypi.python.org/packages/c3/52/85a606f541d627164b8159fd68da9e945ecec375d185069c05b84d5e4aa1/heat-translator-0.5.0.tar.gz \
-    https://pypi.python.org/packages/98/92/9c91d88316ecab35e0b1f23a2d757bd9a4ce73de6caba309ac29e66f2cfd/yang2tosca-0.13.tar.gz \
-    https://pypi.python.org/packages/41/40/0c951f9c78a9be150b432ff50700c3b8d1cd3ef1ec53f00d08b2a7ecc64e/oslo.concurrency-3.11.0.tar.gz \
-    https://pypi.python.org/packages/61/b9/74514d774df110799ff2b100979de6180ead1d5eec6fa15c52e6299361ea/oslo.service-1.12.0.tar.gz \
-    https://pypi.python.org/packages/9f/ec/d8bf0623d7d940c09052368ee859f726410e54b16b13f477ac0e70416de6/neutron-lib-0.2.0.tar.gz \
-    https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.4.2.tar.gz "
-
-export PIP_PACKAGE="https://pypi.python.org/packages/0d/af/8ccfb73834a6ddf9d57ecac61466557b7ca0722620bbb16d2d069ce312db/networking-odl-2.0.0.tar.gz \
-    https://pypi.python.org/packages/90/4f/74b730294de1db393e3e82211b5d2115f9a763849abca7d014348a550d2a/oslosphinx-4.5.0.tar.gz \
-    https://pypi.python.org/packages/74/f0/386f7f73aa6628c1bef53874c5d453b556356d77732add69000aa53b353b/policy2tosca-1.0.tar.gz "
-