Code Review / apex.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Migrate to stable/newton"
[apex.git] / build / Makefile
diff --git a/build/Makefile b/build/Makefile
index b002ed6..c693e89 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -17,30 +17,30 @@ export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${
 export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 export RPMONO = $(shell pwd)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
-export RPMSFC = $(shell pwd)/noarch/opnfv-apex-opendaylight-sfc-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm
 
 
 .PHONY: all
 all: iso
 
 .PHONY: clean
-clean: images-clean rpms-clean iso-clean tacker-clean congress-clean vpp-clean
+clean: images-clean rpms-clean iso-clean tacker-clean tackerclient-clean congress-clean vpp-clean
 
 .PHONY: images
-images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc
+images: undercloud overcloud-full overcloud-opendaylight overcloud-onos
 
 .PHONY: images-clean
-images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean overcloud-opendaylight-sfc-clean
-       @rm -rf images/
+images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean
+       rm -rf images/
 
 .PHONY: rpms
-rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm opendaylight-sfc-rpm
+rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm
 
 .PHONY: rpms-check
-rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check opendaylight-sfc-rpm-check
+rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check
 
 .PHONY: rpms-clean
-rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean opendaylight-sfc-rpm-clean
+rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean
+       rm -rf noarch
 
 opnfv-apex-common.tar.gz:
        pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz
@@ -57,6 +57,9 @@ $(RPMCOM):
        # build the common RPM
        rpmbuild --clean -ba rpm_specs/opnfv-apex-common.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
 
+.PHONY: common-rpm-clean
+common-rpm-clean:
+
 ##################
 #  PYTHON TESTS  #
 ##################
@@ -88,8 +91,8 @@ python-pep8-check:
 .PHONY: tacker-clean
 
 tacker-clean:
-       @rm -rf openstack-tacker-2015.2
-       @rm -f openstack-tacker.tar.gz
+       rm -rf openstack-tacker-2015.2
+       rm -f openstack-tacker.tar.gz
 
 openstack-tacker.tar.gz:
        @echo "Preparing the Tacker RPM prerequisites"
@@ -108,10 +111,9 @@ openstack-tacker-2015.2-1.trozet.noarch.rpm:
 #################
 
 .PHONY: tackerclient-clean
-
 tackerclient-clean:
-       @rm -rf python-tackerclient-2015.2
-       @rm -f python-tackerclient.tar.gz
+       rm -rf python-tackerclient-2015.2
+       rm -f python-tackerclient.tar.gz
 
 python-tackerclient.tar.gz:
        @echo "Preparing the TackerClient RPM prerequisites"
@@ -197,11 +199,11 @@ $(MAVEN_FILE):
 networking-vpp-rpm: networking-vpp.noarch.rpm
 
 networking-vpp.noarch.rpm: networking-vpp
-       pushd networking-vpp && python setup.py bdist_rpm --binary-only
-       mv networking-vpp/dist/*.rpm networking-vpp.noarch.rpm
+       pushd networking-vpp && rpmbuild --clean -bb ../rpm_specs/networking-vpp.spec
+       mv networking-vpp/build/rpm/noarch/*.rpm networking-vpp.noarch.rpm
 
 networking-vpp:
-       git clone -b stable_vlan_rewrite https://github.com/fepan/networking-vpp.git
+       git clone https://git.openstack.org/openstack/networking-vpp
 
 ###############
 #  UNDERCLOUD #
@@ -209,7 +211,9 @@ networking-vpp:
 
 .PHONY: undercloud-clean
 undercloud-clean:
-       @rm -f images/undercloud.*
+       rm -f images/undercloud.*
+       rm -rf opnfv-tht.tar.gz
+       rm -rf opnfv-tht/
 
 .PHONY: undercloud
 undercloud: images/undercloud.qcow2
@@ -236,19 +240,26 @@ $(RPMUDR):
        @echo "Building the Apex Undercloud RPM"
        rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
 
+.PHONY: undercloud-rpm-clean
+undercloud-rpm-clean:
+
 ###############
 #  OVERCLOUD  #
 ###############
 
 .PHONY: overcloud-full-clean
 overcloud-full-clean:
-       @rm -rf images/overcloud-full.d
-       @rm -f images/overcloud-full.*
+       rm -rf images/overcloud-full.d
+       rm -f images/overcloud-full.*
+       rm -rf opnfv-puppet-tripleo.tar.gz
+       rm -rf opnfv-puppet-tripleo/
+       rm -rf os-net-config.tar.gz
+       rm -rf os-net-config/
 
 .PHONY: overcloud-full
 overcloud-full: images/overcloud-full.qcow2
 
-images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm networking-vpp-rpm
+images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm
        @echo "Building the Apex Base Overcloud Image"
        @./overcloud-full.sh
 
@@ -282,6 +293,9 @@ $(RPMODL):
        # build the overcloud RPM
        rpmbuild --clean -ba rpm_specs/opnfv-apex.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
 
+.PHONY: opendaylight-rpm-clean
+opendaylight-rpm-clean:
+
 ###############
 #    ONOS     #
 ###############
@@ -301,7 +315,8 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2
 
 .PHONY: onos-rpm-clean
 onos-rpm-clean:
-       @rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
+       @#rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')"
+       rm -rf opnfv-apex-onos.tar.gz
 
 opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2
        tar -czf opnfv-apex-onos.tar.gz --xform="s:images/overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/images/overcloud-full-onos.qcow2:" images/overcloud-full-onos.qcow2
@@ -318,35 +333,6 @@ $(RPMONO):
        # build the overcloud RPM
        rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
 
-###############
-#   ODL-SFC   #
-###############
-
-.PHONY: overcloud-opendaylight-sfc-clean
-overcloud-opendaylight-sfc-clean:
-       @rm -f images/overcloud-full-opendaylight-sfc.qcow2
-
-.PHONY: overcloud-opendaylight-sfc
-overcloud-opendaylight-sfc: images/overcloud-full-opendaylight-sfc.qcow2
-
-images/overcloud-full-opendaylight-sfc.qcow2: images/overcloud-full-opendaylight.qcow2
-       @echo "Building the Apex OpenDaylight Overcloud Image"
-       @./overcloud-opendaylight-sfc.sh
-
-opnfv-apex-opendaylight-sfc.tar.gz: images/overcloud-full-opendaylight-sfc.qcow2
-       tar -czf opnfv-apex-opendaylight-sfc.tar.gz --xform="s:images/overcloud-full-opendaylight-sfc.qcow2:opnfv-apex-opendaylight-sfc-$(RPMVERS)/build/images/overcloud-full-opendaylight-sfc.qcow2:" images/overcloud-full-opendaylight-sfc.qcow2
-
-.PHONY: opendaylight-sfc-rpm-check
-opendaylight-sfc-rpm-check: opnfv-apex-opendaylight-sfc.tar.gz
-       rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-opendaylight-sfc.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
-
-.PHONY: opendaylight-sfc-rpm
-opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC)
-
-$(RPMSFC):
-       @echo "Building the Apex OpenDaylight SFC RPM"
-       rpmbuild --clean -ba rpm_specs/opnfv-apex-opendaylight-sfc.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`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')"
-
 ###############
 #    ISO      #
 ###############
@@ -385,7 +371,6 @@ iso:        iso-clean images rpms $(CENTISO)
        @ln $(RPMUDR) centos/Packages
        @ln $(RPMODL) centos/Packages
        @ln $(RPMONO) centos/Packages
-       @ln $(RPMSFC) centos/Packages
        # add packages to the centos packages
        cd centos/Packages && yumdownloader openvswitch
        cd centos/Packages && yumdownloader openstack-tripleo