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/openstack/pip/Dockerfile | 30 ------------------------------ repo/openstack/pip/code_url.conf | 21 --------------------- 2 files changed, 51 deletions(-) delete mode 100644 repo/openstack/pip/Dockerfile delete mode 100644 repo/openstack/pip/code_url.conf (limited to 'repo/openstack') diff --git a/repo/openstack/pip/Dockerfile b/repo/openstack/pip/Dockerfile deleted file mode 100644 index 195b6a01..00000000 --- a/repo/openstack/pip/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:14.04.3 -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 ./cp_pip.sh /cp_pip.sh - -RUN chmod +x cp_pip.sh - -RUN apt-get update - -RUN apt-get install -y git python-setuptools - -RUN easy_install -U pip - -RUN mkdir -p /home/tmp - -RUN mkdir -p openstack_pip - -RUN /make_pip.sh - -RUN tar -zcvf openstack_pip.tar.gz openstack_pip/ - -CMD ["/cp_pip.sh"] diff --git a/repo/openstack/pip/code_url.conf b/repo/openstack/pip/code_url.conf deleted file mode 100644 index fa7b02e3..00000000 --- a/repo/openstack/pip/code_url.conf +++ /dev/null @@ -1,21 +0,0 @@ -#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 " -- cgit 1.2.3-korg