From 6f279a7362504418cfcc453e11b3a9c2d458a2ea Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 18 Jan 2017 16:47:25 +0800 Subject: Adjust make repo Demand: 1.Compass4nfv master code only support one OPNFV version now, no need to keep previous version's repo scripts 2.Currently java packages are in /var/www/package/onos directory which is unreasonable 3.repo.conf has a lot of download URL which can turn into pip requirements Modification: 1.Remove previous version's directory in compass4nfv/repo 2.Only leave java and odl in compass4nfv/repo/features. Other features can be added when they are ready 3.Seperate URLs in repo.conf into compass-core and openstack pip requirements. Therefore pip.tar.gz only contains pip packages for compass-core and pip-openstack.tar.gz only contains pip packages for openstack 3.Move java packages into /var/www/package/java directory 4.Add make pip wheel package function to support congress 5.Use ODL package distribution-karaf-0.5.0-Boron.tar.gz 6.Use python package netwoking-odl-3.2.0 Change-Id: Ifa818e7630ac4435e3bdb7756b83f80f50c24a76 Signed-off-by: Harry Huang --- repo/pip/Dockerfile | 36 +++++++++++++++++++++ repo/pip/code_url.conf | 24 ++++++++++++++ repo/pip/core-requirement.txt | 62 ++++++++++++++++++++++++++++++++++++ repo/pip/extra-requirement-tar.txt | 4 +++ repo/pip/extra-requirement-wheel.txt | 11 +++++++ 5 files changed, 137 insertions(+) create mode 100644 repo/pip/Dockerfile create mode 100644 repo/pip/code_url.conf create mode 100644 repo/pip/core-requirement.txt create mode 100644 repo/pip/extra-requirement-tar.txt create mode 100644 repo/pip/extra-requirement-wheel.txt (limited to 'repo/pip') diff --git a/repo/pip/Dockerfile b/repo/pip/Dockerfile new file mode 100644 index 00000000..e8fed1ba --- /dev/null +++ b/repo/pip/Dockerfile @@ -0,0 +1,36 @@ +FROM ubuntu:16.04 +MAINTAINER Yifei Xue + +ADD ./code_url.conf /code_url.conf + +RUN chmod +x code_url.conf + +ADD ./make_pip.sh /make_pip.sh + +RUN chmod +x make_pip.sh + +ADD ./make_pip_wheel.sh /make_pip_wheel.sh + +RUN chmod +x make_pip_wheel.sh + +ADD ./cp_pip.sh /cp_pip.sh + +RUN chmod +x cp_pip.sh + +RUN apt-get update + +RUN apt-get install -y git python-pip + +RUN apt-get install -y libssl-dev libffi-dev + +RUN mkdir -p /home/tmp + +RUN mkdir -p /pip-openstack + +RUN /make_pip.sh + +RUN /make_pip_wheel.sh + +RUN tar -zcvf pip-openstack.tar.gz /pip-openstack + +CMD ["/cp_pip.sh"] diff --git a/repo/pip/code_url.conf b/repo/pip/code_url.conf new file mode 100644 index 00000000..062e0bff --- /dev/null +++ b/repo/pip/code_url.conf @@ -0,0 +1,24 @@ +#export BRANCH=${BRANCH:-master} +export BRANCH=${BRANCH:-stable/newton} + +export GIT_URL="https://github.com/openstack/keystone.git \ + https://github.com/openstack/python-keystoneclient.git \ + https://github.com/openstack/nova.git \ + https://github.com/openstack/python-novaclient.git \ + https://github.com/openstack/neutron.git \ + https://github.com/openstack/python-neutronclient.git \ + https://github.com/openstack/cinder.git \ + https://github.com/openstack/python-cinderclient.git \ + https://github.com/openstack/glance.git \ + https://github.com/openstack/python-glanceclient.git \ + https://github.com/openstack/ceilometer.git \ + https://github.com/openstack/python-ceilometerclient.git \ + https://github.com/openstack/heat.git \ + https://github.com/openstack/python-heatclient.git \ + https://github.com/openstack/aodh.git \ + https://github.com/openstack/python-aodhclient.git \ + https://github.com/openstack/tacker.git \ + https://github.com/openstack/python-tackerclient.git " + +export PIP_GIT_URL="https://github.com/openstack/congress.git \ + https://github.com/openstack/python-congressclient.git" diff --git a/repo/pip/core-requirement.txt b/repo/pip/core-requirement.txt new file mode 100644 index 00000000..ce654d7c --- /dev/null +++ b/repo/pip/core-requirement.txt @@ -0,0 +1,62 @@ +# python packages used to install compass-core + +ez_setup +setuptools==18.2 +ansible==2.2.0.0 +virtualenv==13.1.2 +pexpect==3.3 +amqplib==1.0.2 +Cheetah==2.4.1 +daemon==1.1 +Flask==0.10.1 +Flask-Login==0.2.11 +Flask_RESTful==0.3.4 +Flask_WTF==0.12 +importlib==1.0.3 +lockfile==0.10.2 +MySQL-python==1.2.5 +netaddr==0.7.18 +PyChef==0.2.3 +SQLAlchemy==1.0.8 +simplejson==3.8.0 +requests==2.7.0 +celery==3.1.18 +Werkzeug==0.10.4 +ciso8601==1.0.1 +six==1.9.0 +WTForms==2.0.2 +docutils==0.12 +amqp==1.4.6 +Markdown<2.5 +argparse==1.3.0 +Flask-Script==2.0.5 +Flask-SQLAlchemy==0.10 +pytz==2014.3 +ecdsa==0.12 +itsdangerous==0.24 +paramiko==1.12.3 +python_daemon==2.0.4 +redis==2.7.1 +billiard==3.3.0.20 +kombu==3.0.26 +Jinja2==2.8 +aniso8601==0.85 +anyjson==0.3.3 +ordereddict==1.0 +lazypy==0.5 +pycrypto-on-pypi==2.3 +pymongo==3.0.3 +crudini==0.7 +python-keyczar==0.715 +pyasn1==0.1.9 +cliff==1.15.0 +Babel==2.3.4 +tosca-parser==0.5.0 +heat-translator==0.5.0 +yang2tosca==0.13 +oslo.concurrency==3.11.0 +oslo.service==1.12.0 +neutron-lib==0.2.0 +python-dateutil==2.4.2 +pycrypto>=2.6.1 +MarkupSafe>=0.23 diff --git a/repo/pip/extra-requirement-tar.txt b/repo/pip/extra-requirement-tar.txt new file mode 100644 index 00000000..a13c1305 --- /dev/null +++ b/repo/pip/extra-requirement-tar.txt @@ -0,0 +1,4 @@ +# extra python packages used in deployment +# download format tar.gz + +networking-odl==3.2.0 diff --git a/repo/pip/extra-requirement-wheel.txt b/repo/pip/extra-requirement-wheel.txt new file mode 100644 index 00000000..5cdc6469 --- /dev/null +++ b/repo/pip/extra-requirement-wheel.txt @@ -0,0 +1,11 @@ +# extra python packages used in deployment +# download format pip wheel + +python-cloudfoundryclient==1.0.2 +pip==9.0.1 +oslosphinx==4.5.0 +policy2tosca==1.0 +yang2tosca==0.13 +python-keyczar==0.715 +crudini==0.7 +pexpect==3.3 -- cgit 1.2.3-korg