Add euca2ools 3.1 and requestbuilder 0.2.3

Add the following packages to our repo. All the VPC code in euca has been upstreamed and hence no need to build our own euca pkg. Also euca 3.1 has moved to requestbuilder and does not use boto. Remove local copy of euca and boto from debian builds. Change-Id: I5e911a6a4bb721056c51c023886cb7b0c9373a3f
Juniper · Oct 22, 2014 · bdbafa7 · bdbafa7
1 parent eae7dab
commit bdbafa7
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 779 deletions.
diff --git a/build/package_configs/ubuntu1204/havana/contrail_packages.cfg b/build/package_configs/ubuntu1204/havana/contrail_packages.cfg
@@ -89,14 +89,6 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
 
-[euca2ools-deb]
-pkgs      = euca2ools
-makeloc   = tools/packaging/common/debian
-
-[python-boto-deb]
-pkgs      = python-boto
-makeloc   = tools/packaging/common/debian
-
 [ifmap-server]
 pkgs      = ifmap-server
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1204/havana/depends_packages.cfg b/build/package_configs/ubuntu1204/havana/depends_packages.cfg
@@ -1987,3 +1987,15 @@ md5  = 660841797374d33e8cafd0f541bea7cf
 [libxtables10]
 file = libxtables10_1.4.18-1.1ubuntu1_amd64.deb
 md5  = 11e53ffc5b0dd762189e64418b45c25c
+
+[euca2ools]
+file = euca2ools_3.1.0-1_all.deb
+md5  = 583bcfc344347a3b9f614041aaef1770
+
+[python-requestbuilder]
+file = python-requestbuilder_0.2.3-1_all.deb
+md5  = b44194d8ef92a657301ff72b68c05f72
+
+[python-boto]
+file = python-boto_2.20.1-2ubuntu2_all.deb
+md5 = dea56cd0b6d15986d8d950c12a711cb7
diff --git a/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg b/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg
@@ -89,14 +89,6 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
 
-[euca2ools-deb]
-pkgs      = euca2ools
-makeloc   = tools/packaging/common/debian
-
-[python-boto-deb]
-pkgs      = python-boto
-makeloc   = tools/packaging/common/debian
-
 [ifmap-server]
 pkgs      = ifmap-server
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg
@@ -1727,3 +1727,15 @@ md5  = 660841797374d33e8cafd0f541bea7cf
 [libxtables10]
 file = libxtables10_1.4.18-1.1ubuntu1_amd64.deb
 md5  = 11e53ffc5b0dd762189e64418b45c25c
+
+[euca2ools]
+file = euca2ools_3.1.0-1_all.deb
+md5  = 583bcfc344347a3b9f614041aaef1770
+
+[python-requestbuilder]
+file = python-requestbuilder_0.2.3-1_all.deb
+md5  = b44194d8ef92a657301ff72b68c05f72
+
+[python-boto]
+file = python-boto_2.20.1-2ubuntu2_all.deb
+md5 = dea56cd0b6d15986d8d950c12a711cb7
diff --git a/build/package_configs/ubuntu1204/juno/contrail_packages.cfg b/build/package_configs/ubuntu1204/juno/contrail_packages.cfg
@@ -93,14 +93,6 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
 
-[euca2ools-deb]
-pkgs      = euca2ools
-makeloc   = tools/packaging/common/debian
-
-[python-boto-deb]
-pkgs      = python-boto
-makeloc   = tools/packaging/common/debian
-
 [ifmap-server]
 pkgs      = ifmap-server
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1204/juno/depends_packages.cfg b/build/package_configs/ubuntu1204/juno/depends_packages.cfg
@@ -1824,3 +1824,14 @@ md5   = 1b7626e4edab8164b11f74b323a4413f
 file  = zookeeper_3.4.5+dfsg-1_all.deb
 md5   = 59083991e535cb097e9db55714b78589
 
+[euca2ools]
+file = euca2ools_3.1.0-1_all.deb
+md5  = 583bcfc344347a3b9f614041aaef1770
+
+[python-requestbuilder]
+file = python-requestbuilder_0.2.3-1_all.deb
+md5  = b44194d8ef92a657301ff72b68c05f72
+
+[python-boto]
+file = python-boto_2.20.1-2ubuntu2_all.deb
+md5 = dea56cd0b6d15986d8d950c12a711cb7
diff --git a/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg b/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg
@@ -89,14 +89,6 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
 
-[euca2ools-deb]
-pkgs      = euca2ools
-makeloc   = tools/packaging/common/debian
-
-[python-boto-deb]
-pkgs      = python-boto
-makeloc   = tools/packaging/common/debian
-
 [ifmap-server]
 pkgs      = ifmap-server
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg
@@ -1727,3 +1727,15 @@ md5  = 660841797374d33e8cafd0f541bea7cf
 [libxtables10]
 file = libxtables10_1.4.18-1.1ubuntu1_amd64.deb
 md5  = 11e53ffc5b0dd762189e64418b45c25c
+
+[euca2ools]
+file = euca2ools_3.1.0-1_all.deb
+md5  = 583bcfc344347a3b9f614041aaef1770
+
+[python-requestbuilder]
+file = python-requestbuilder_0.2.3-1_all.deb
+md5  = b44194d8ef92a657301ff72b68c05f72
+
+[python-boto]
+file = python-boto_2.20.1-2ubuntu2_all.deb
+md5 = dea56cd0b6d15986d8d950c12a711cb7
diff --git a/build/package_configs/ubuntu1404/juno/contrail_packages.cfg b/build/package_configs/ubuntu1404/juno/contrail_packages.cfg
@@ -89,14 +89,6 @@ makeloc   = tools/packaging/common/debian
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
 
-[euca2ools-deb]
-pkgs      = euca2ools
-makeloc   = tools/packaging/common/debian
-
-[python-boto-deb]
-pkgs      = python-boto
-makeloc   = tools/packaging/common/debian
-
 [ifmap-server]
 pkgs      = ifmap-server
 makeloc   = tools/packaging/common/debian

diff --git a/build/package_configs/ubuntu1404/juno/depends_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_packages.cfg
@@ -1824,3 +1824,14 @@ md5   = 1b7626e4edab8164b11f74b323a4413f
 file  = zookeeper_3.4.5+dfsg-1_all.deb
 md5   = 59083991e535cb097e9db55714b78589
 
+[euca2ools]
+file = euca2ools_3.1.0-1_all.deb
+md5  = 583bcfc344347a3b9f614041aaef1770
+
+[python-requestbuilder]
+file = python-requestbuilder_0.2.3-1_all.deb
+md5  = b44194d8ef92a657301ff72b68c05f72
+
+[python-boto]
+file = python-boto_2.20.1-2ubuntu2_all.deb
+md5 = dea56cd0b6d15986d8d950c12a711cb7
diff --git a/common/debian/Makefile b/common/debian/Makefile
@@ -62,8 +62,6 @@ PACKAGES = \
 	contrail-openstack-webui-deb \
 	contrail-fabric-utils-deb \
 	contrail-test-deb \
-	euca2ools-deb \
-	python-boto-deb \
 	libvirt-deb \
 	contrail-openstack-dashboard-deb \
 	contrail-ostack-dashboard-deb \
@@ -166,26 +164,6 @@ contrail-test-clean:
 	$(eval TGZ_FILE=$(SB_TOP)/build/tools/contrail-test-$(VERSION)~$(CONTRAIL_SKU).tgz)
 	rm -rf ${TGZ_FILE}
 
-euca2ools-deb:
-	$(eval BUILDDIR=${SB_TOP}/third_party/euca2ools)
-	cp -R euca2ools/debian ${BUILDDIR}/debian
-	(cd ${BUILDDIR}; fakeroot debian/rules clean)
-	(cd ${BUILDDIR}; fakeroot debian/rules binary)
-
-euca2ools-clean:
-	$(eval BUILDDIR=${SB_TOP}/third_party/euca2ools)
-	rm -rf ${BUILDDIR}/debian
-
-python-boto-deb:
-	$(eval BUILDDIR=${SB_TOP}/third_party/python-boto)
-	cp -R python-boto/debian ${BUILDDIR}/debian
-	(cd ${BUILDDIR}; fakeroot debian/rules clean)
-	(cd ${BUILDDIR}; fakeroot debian/rules binary)
-
-python-boto-clean:
-	$(eval BUILDDIR=${SB_TOP}/third_party/python-boto)
-	rm -rf ${BUILDDIR}/debian
-
 contrail-openstack-icehouse-deb:
 	$(eval BUILDDIR=${SB_TOP}/build/debian/tmp)
 	rm -rf ${BUILDDIR}