From 0b7fdc099fd750c76334261ef18bfa2e3d70234e Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 16 Aug 2016 16:48:21 -0400 Subject: adding tackerclient to the build JIRA: APEX-235 Change-Id: Ie3ead17f1f82bc74dc38413bb4a3118fbcb82e9c Signed-off-by: Dan Radez --- build/Makefile | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'build/Makefile') diff --git a/build/Makefile b/build/Makefile index 91b1fc5a..0d7cba27 100644 --- a/build/Makefile +++ b/build/Makefile @@ -100,12 +100,34 @@ openstack-tacker.tar.gz: tar czf openstack-tacker.tar.gz openstack-tacker-2015.2 .PHONY: tacker-rpm -tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.noarch.rpm +tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm -openstack-tacker-2015.2-1.noarch.rpm: +openstack-tacker-2015.2-1.trozet.noarch.rpm: @echo "Building the Tacker RPM" rpmbuild --clean -bb --target noarch openstack-tacker.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' +################# +# TACKERCLIENT # +################# + +.PHONY: tackerclient-clean + +tackerclient-clean: + @rm -rf python-tackerclient-2015.2 + @rm -f python-tackerclient.tar.gz + +python-tackerclient.tar.gz: + @echo "Preparing the TackerClient RPM prerequisites" + git clone http://github.com/trozet/python-tackerclient -b SFC_refactor python-tackerclient-2015.2 + tar czf python-tackerclient.tar.gz python-tackerclient-2015.2 + +.PHONY: tackerclient-rpm +tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet.noarch.rpm + +python-tackerclient-2015.2-1.trozet.noarch.rpm: + @echo "Building the TackerClient RPM" + rpmbuild --clean -bb --target noarch python-tackerclient.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' + ############### # CONGRESS # ############### @@ -167,7 +189,7 @@ undercloud-clean: .PHONY: undercloud undercloud: images/undercloud.qcow2 -images/undercloud.qcow2: +images/undercloud.qcow2: tackerclient-rpm @echo "Building the Apex Undercloud Image" @./undercloud.sh @@ -201,7 +223,7 @@ overcloud-full-clean: .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 -images/overcloud-full.qcow2: tacker-rpm congress-rpm vpp-build +images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm vpp-build @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh -- cgit 1.2.3-korg