diff options
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 383 |
1 files changed, 160 insertions, 223 deletions
diff --git a/build/Makefile b/build/Makefile index c693e895..af84ea85 100644 --- a/build/Makefile +++ b/build/Makefile @@ -9,56 +9,98 @@ export USE_MASTER = "" export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-DVD-1511.iso -export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD)) export RELEASE = "0" -export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso + +export RPM_DIST = $(shell rpm -E %dist) + +export TACKER_REPO := $(shell awk -F\= '/^tacker_repo/ {print $$2}' variables.sh ) +export TACKER_BRANCH := $(shell awk -F\= '/^tacker_branch/ {print $$2}' variables.sh ) +export TACKER_COMMIT := $(shell git ls-remote $(TACKER_REPO) $(TACKER_BRANCH) | awk '{print substr($$1,1,7)}') + +export TACKERCLIENT_REPO := $(shell awk -F\= '/^tackerclient_repo/ {print $$2}' variables.sh ) +export TACKERCLIENT_BRANCH := $(shell awk -F\= '/^tackerclient_branch/ {print $$2}' variables.sh ) +export TACKERCLIENT_COMMIT := $(shell git ls-remote $(TACKERCLIENT_REPO) $(TACKERCLIENT_BRANCH) | awk '{print substr($$1,1,7)}') + +export CONGRESS_REPO := $(shell awk -F\= '/^congress_repo/ {print $$2}' variables.sh ) +export CONGRESS_BRANCH := $(shell awk -F\= '/^congress_branch/ {print $$2}' variables.sh ) +export CONGRESS_COMMIT := $(shell git ls-remote $(CONGRESS_REPO) $(CONGRESS_BRANCH) | awk '{print substr($$1,1,7)}') + +export NETVPP_VERS := $(shell grep Version $(shell pwd)/rpm_specs/networking-vpp.spec | head -n 1 | awk '{ print $$2 }') +export NETVPP_REPO := $(shell awk -F\= '/^netvpp_repo/ {print $$2}' variables.sh ) +export NETVPP_BRANCH := $(shell awk -F\= '/^netvpp_branch/ {print $$2}' variables.sh ) +export NETVPP_COMMIT := $(shell git ls-remote $(NETVPP_REPO) $(NETVPP_BRANCH) | awk '{print substr($$1,1,7)}') + +export RELRPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex-release.spec | head -n 1 | awk '{ print $$2 }') export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }') -export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm -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 BUILD_ROOT = $(shell pwd) +export BUILD_DIR = $(shell dirname $$(pwd))/.build +export CACHE_DIR = $(shell dirname $$(pwd))/.cache +export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '_sourcedir $(BUILD_DIR)' -D '_rpmdir $(BUILD_DIR)' -D '_specdir $(BUILD_DIR)' -D '_srcrpmdir $(BUILD_DIR)' + +export RPMREL = $(BUILD_DIR)/noarch/opnfv-apex-release-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export RPMCOM = $(BUILD_DIR)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export RPMUDR = $(BUILD_DIR)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export RPMODL = $(BUILD_DIR)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export RPMONO = $(BUILD_DIR)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm +export ISO = $(BUILD_DIR)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso +export CENTISO = $(BUILD_DIR)/$(shell basename $(CENTDNLD)) .PHONY: all all: iso .PHONY: clean -clean: images-clean rpms-clean iso-clean tacker-clean tackerclient-clean congress-clean vpp-clean +clean: + rm -rf $(BUILD_DIR) + +.PHONY: clean-cache +clean-cache: + rm -rf $(CACHE_DIR) .PHONY: images images: undercloud overcloud-full overcloud-opendaylight overcloud-onos -.PHONY: images-clean -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 .PHONY: rpms-check -rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check +rpms-check: release-rpm-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 - rm -rf noarch +rpms-clean: + rm -rf $(BUILD_DIR)/noarch + rm -rf $(BUILD_DIR)/BUILDROOT + +$(BUILD_DIR)/opnfv-apex-release.tar.gz: + mkdir -p $(BUILD_DIR) + pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-release-$(RELRPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-release.tar.gz + +.PHONY: release-rpm-check +release-rpm-check: $(BUILD_DIR)/opnfv-apex-release.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + +.PHONY: release-rpm +release-rpm: $(BUILD_DIR)/opnfv-apex-release.tar.gz $(RPMREL) -opnfv-apex-common.tar.gz: - pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz +$(RPMREL): + @echo "Building the Apex Release RPM" + # build the release RPM + rpmbuild --clean -ba rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + +$(BUILD_DIR)/opnfv-apex-common.tar.gz: + pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-common.tar.gz .PHONY: common-rpm-check -common-rpm-check: opnfv-apex-common.tar.gz - rpmbuild --clean -bi -bl 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 '_-')" +common-rpm-check: $(BUILD_DIR)/opnfv-apex-common.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: common-rpm -common-rpm: opnfv-apex-common.tar.gz $(RPMCOM) +common-rpm: $(BUILD_DIR)/opnfv-apex-common.tar.gz $(RPMCOM) $(RPMCOM): @echo "Building the Apex Common RPM" # 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: + rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" ################## # PYTHON TESTS # @@ -88,178 +130,109 @@ python-pep8-check: # TACKER # ############### -.PHONY: tacker-clean - -tacker-clean: - rm -rf openstack-tacker-2015.2 - rm -f openstack-tacker.tar.gz - -openstack-tacker.tar.gz: +$(BUILD_DIR)/openstack-tacker.tar.gz: @echo "Preparing the Tacker RPM prerequisites" - git clone http://github.com/trozet/tacker -b SFC_colorado openstack-tacker-2015.2 - tar czf openstack-tacker.tar.gz openstack-tacker-2015.2 + git clone $(TACKER_REPO) -b $(TACKER_BRANCH) $(BUILD_DIR)/openstack-tacker-2016.2 + tar czf $(BUILD_DIR)/openstack-tacker.tar.gz -C $(BUILD_DIR) openstack-tacker-2016.2 .PHONY: tacker-rpm -tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm +tacker-rpm: $(BUILD_DIR)/openstack-tacker.tar.gz $(BUILD_DIR)/noarch/openstack-tacker-2016.2-1.git$(TACKER_COMMIT).noarch.rpm -openstack-tacker-2015.2-1.trozet.noarch.rpm: +$(BUILD_DIR)/noarch/openstack-tacker-2016.2-1.git$(TACKER_COMMIT).noarch.rpm: @echo "Building the Tacker RPM" - rpmbuild --clean -bb --target noarch rpm_specs/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`)' + rpmbuild --clean -ba --target noarch rpm_specs/openstack-tacker.spec $(RPM_DIR_ARGS) -D 'git .git$(TACKER_COMMIT)' ################# # TACKERCLIENT # ################# -.PHONY: tackerclient-clean -tackerclient-clean: - rm -rf python-tackerclient-2015.2 - rm -f python-tackerclient.tar.gz - -python-tackerclient.tar.gz: +$(BUILD_DIR)/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 + git clone $(TACKERCLIENT_REPO) -b $(TACKERCLIENT_BRANCH) $(BUILD_DIR)/python-tackerclient-2016.2 + tar czf $(BUILD_DIR)/python-tackerclient.tar.gz -C $(BUILD_DIR) python-tackerclient-2016.2 .PHONY: tackerclient-rpm -tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet.noarch.rpm +tackerclient-rpm: $(BUILD_DIR)/python-tackerclient.tar.gz $(BUILD_DIR)/noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarch.rpm -python-tackerclient-2015.2-1.trozet.noarch.rpm: +$(BUILD_DIR)/noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarch.rpm: @echo "Building the TackerClient RPM" - rpmbuild --clean -bb --target noarch rpm_specs/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`)' + rpmbuild --clean -ba --target noarch rpm_specs/python-tackerclient.spec $(RPM_DIR_ARGS) -D 'git .git$(TACKERCLIENT_COMMIT)' ############### # CONGRESS # ############### .PHONY: congress-clean - congress-clean: - @rm -rf openstack-congress-2016.1 - @rm -f openstack-congress.tar.gz + @rm -rf $(BUILD_DIR)/openstack-congress-2016.2 + @rm -f $(BUILD_DIR)/openstack-congress.tar.gz -openstack-congress.tar.gz: +$(BUILD_DIR)/openstack-congress.tar.gz: @echo "Preparing the Congress RPM prerequisites" - git clone http://github.com/openstack/congress -b stable/mitaka openstack-congress-2016.1 - cd openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service - tar czf openstack-congress.tar.gz openstack-congress-2016.1 + git clone $(CONGRESS_REPO) -b $(CONGRESS_BRANCH) $(BUILD_DIR)/openstack-congress-2016.2 + cd $(BUILD_DIR)/openstack-congress-2016.2 && curl -O https://radez.fedorapeople.org/openstack-congress.service + tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.2 .PHONY: congress-rpm -congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm +congress-rpm: $(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm -openstack-congress-2016.1-1.noarch.rpm: +$(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm: $(BUILD_DIR)/openstack-congress.tar.gz @echo "Building the Congress RPM" - rpmbuild --clean -bb --target noarch rpm_specs/openstack-congress.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`)' + rpmbuild --clean -ba --target noarch rpm_specs/openstack-congress.spec $(RPM_DIR_ARGS) -D 'git .git$(CONGRESS_COMMIT)' -############### -# VPP # -############### +################## +# NETWORKING-VPP # +################## -VPP_DIR = vpp -MAVEN = apache-maven-3.3.9 -MAVEN_FILE = $(MAVEN)-bin.tar.gz - -.PHONY: vpp-clean -vpp-clean: - @rm -f vpp-bin.tar.gz - @rm -rf vpp-bin vpp - @rm -rf honeycomb $(MAVEN) $(MAVEN_FILE) honeycomb-1.0.0-99.noarch.rpm - @rm -rf networking-vpp networking-vpp.noarch.rpm - -.PHONY: vpp-build -vpp-build: vpp-bin.tar.gz - -vpp-bin.tar.gz: vpp honeycomb $(MAVEN) - $(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm - $(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install - pushd vpp/vpp-api/python && python setup.py bdist - pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-registry-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-registry -Dversion=16.12-SNAPSHOT -Dpackaging=jar - pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-core-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-core -Dversion=16.12-SNAPSHOT -Dpackaging=jar - pushd honeycomb && ../$(MAVEN)/bin/mvn clean install -DskipTests - pushd honeycomb/packaging/rpm/ && BUILD_NUMBER=99 ./rpmbuild.sh - mkdir vpp-bin - mv vpp/build-root/*.rpm vpp-bin/ - mv honeycomb/packaging/rpm/RPMS/noarch/*.rpm . - mv vpp/vpp-api/python/dist/*.tar.gz vpp-bin/ - tar czf vpp-bin.tar.gz vpp-bin - -vpp: - git clone https://gerrit.fd.io/r/vpp - -honeycomb: - git clone https://gerrit.fd.io/r/p/honeycomb.git - -$(MAVEN): $(MAVEN_FILE) - tar zxvf apache-maven-3.3.9-bin.tar.gz - cp mvn_settings.xml $(MAVEN)/conf/settings.xml - -$(MAVEN_FILE): - wget http://www.webhostingjams.com/mirror/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz +$(BUILD_DIR)/python-networking-vpp.tar.gz: + @echo "Preparing the networking-vpp RPM prerequisites" + git clone $(NETVPP_REPO) $(BUILD_DIR)/python-networking-vpp-$(NETVPP_VERS) + tar czf $(BUILD_DIR)/python-networking-vpp.tar.gz -C $(BUILD_DIR) python-networking-vpp-$(NETVPP_VERS) .PHONY: networking-vpp-rpm -networking-vpp-rpm: networking-vpp.noarch.rpm - -networking-vpp.noarch.rpm: networking-vpp - pushd networking-vpp && rpmbuild --clean -bb ../rpm_specs/networking-vpp.spec - mv networking-vpp/build/rpm/noarch/*.rpm networking-vpp.noarch.rpm +networking-vpp-rpm: $(BUILD_DIR)/noarch/python-networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm -networking-vpp: - git clone https://git.openstack.org/openstack/networking-vpp +$(BUILD_DIR)/noarch/python-networking-vpp-$(NETVPP_VERS)-1.git$(NETVPP_COMMIT)$(RPM_DIST).noarch.rpm: $(BUILD_DIR)/python-networking-vpp.tar.gz + @echo "Building the Networking VPP RPM" + rpmbuild --clean -ba --target noarch rpm_specs/networking-vpp.spec $(RPM_DIR_ARGS) -D 'git .git$(NETVPP_COMMIT)' ############### # UNDERCLOUD # ############### -.PHONY: undercloud-clean -undercloud-clean: - rm -f images/undercloud.* - rm -rf opnfv-tht.tar.gz - rm -rf opnfv-tht/ - .PHONY: undercloud -undercloud: images/undercloud.qcow2 +undercloud: $(BUILD_DIR)/undercloud.qcow2 -images/undercloud.qcow2: tackerclient-rpm +$(BUILD_DIR)/undercloud.qcow2: tackerclient-rpm @echo "Building the Apex Undercloud Image" @./undercloud.sh -opnfv-apex-undercloud.tar.gz: images/undercloud.qcow2 +$(BUILD_DIR)/opnfv-apex-undercloud.tar.gz: $(BUILD_DIR)/undercloud.qcow2 @echo "Preparing the Apex Undercloud RPM prerequisites" - pushd ../ && git archive --format=tar --prefix=opnfv-apex-undercloud-$(RPMVERS)/ HEAD > build/opnfv-apex-undercloud.tar - tar -rf opnfv-apex-undercloud.tar \ - --xform="s:images/undercloud.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/undercloud.qcow2:" images/undercloud.qcow2 - gzip -f opnfv-apex-undercloud.tar + pushd ../ && git archive --format=tar --prefix=opnfv-apex-undercloud-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-undercloud.tar + tar -rf $(BUILD_DIR)/opnfv-apex-undercloud.tar \ + --xform="s:.*undercloud.qcow2:opnfv-apex-undercloud-$(RPMVERS)/build/undercloud.qcow2:" $(BUILD_DIR)/undercloud.qcow2 + gzip -f $(BUILD_DIR)/opnfv-apex-undercloud.tar .PHONY: undercloud-rpm-check -undercloud-rpm-check: opnfv-apex-undercloud.tar.gz - rpmbuild --clean -bi -bl 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 '_-')" +undercloud-rpm-check: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: undercloud-rpm -undercloud-rpm: opnfv-apex-undercloud.tar.gz $(RPMUDR) +undercloud-rpm: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz $(RPMUDR) $(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: + rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" ############### # OVERCLOUD # ############### -.PHONY: overcloud-full-clean -overcloud-full-clean: - 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 +overcloud-full: $(BUILD_DIR)/overcloud-full.qcow2 -images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm +$(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh @@ -267,71 +240,53 @@ images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm # ODL # ############### -.PHONY: overcloud-opendaylight-clean -overcloud-opendaylight-clean: - @rm -f images/overcloud-full-opendaylight.qcow2 - .PHONY: overcloud-opendaylight -overcloud-opendaylight: images/overcloud-full-opendaylight.qcow2 +overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 -images/overcloud-full-opendaylight.qcow2: images/overcloud-full.qcow2 +$(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 @echo "Building the Apex OpenDaylight Overcloud Image" @./overcloud-opendaylight.sh -opnfv-apex.tar.gz: images/overcloud-full-opendaylight.qcow2 - tar -czf opnfv-apex.tar.gz --xform="s:images/overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/images/overcloud-full-opendaylight.qcow2:" images/overcloud-full-opendaylight.qcow2 +$(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 + tar -czf $(BUILD_DIR)/opnfv-apex.tar.gz --xform="s:.*overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/overcloud-full-opendaylight.qcow2:" $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 .PHONY: opendaylight-rpm-check -opendaylight-rpm-check: opnfv-apex.tar.gz - rpmbuild --clean -bi -bl 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 '_-')" +opendaylight-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: opendaylight-rpm -opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL) +opendaylight-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMODL) $(RPMODL): @echo "Building the Apex OpenDaylight RPM" # 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: + rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" ############### # ONOS # ############### -.PHONY: overcloud-onos-clean -overcloud-onos-clean: - @rm -f images/overcloud-full-onos.qcow2 - @rm -rf images/puppet-onos - @rm -f images/puppet-onos.tar.gz - .PHONY: overcloud-onos -overcloud-onos: images/overcloud-full-onos.qcow2 +overcloud-onos: $(BUILD_DIR)/overcloud-full-onos.qcow2 -images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2 +$(BUILD_DIR)/overcloud-full-onos.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 @echo "Building the Apex ONOS Overcloud Image" @./overcloud-onos.sh -.PHONY: onos-rpm-clean -onos-rpm-clean: - @#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 +$(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2 + tar -czf $(BUILD_DIR)/opnfv-apex-onos.tar.gz --xform="s:.*overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/overcloud-full-onos.qcow2:" $(BUILD_DIR)/overcloud-full-onos.qcow2 .PHONY: onos-rpm-check -onos-rpm-check: opnfv-apex-onos.tar.gz - rpmbuild --clean -bi -bl 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 '_-')" +onos-rpm-check: $(BUILD_DIR)/opnfv-apex-onos.tar.gz + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: onos-rpm -onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO) +onos-rpm: $(BUILD_DIR)/opnfv-apex-onos.tar.gz $(RPMONO) $(RPMONO): @echo "Building the Apex ONOS RPM" # 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 '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" ############### # ISO # @@ -340,10 +295,9 @@ $(RPMONO): $(CENTISO): curl $(CENTDNLD) -z $(CENTISO) -o $(CENTISO) --verbose --silent --location -.PHONY: iso-clean iso-clean: - @rm -Rf centos - @rm -Rf release + @rm -Rf $(BUILD_DIR)/centos + @rm -Rf $(BUILD_DIR)/release @rm -f $(ISO) .PHONY: mount-centiso umount-centiso @@ -362,33 +316,26 @@ umount-centiso: .PHONY: iso iso: iso-clean images rpms $(CENTISO) @echo "Building the Apex ISO" - @mkdir centos release - cd centos && bsdtar -xf ../$(shell basename $(CENTISO)) + @mkdir $(BUILD_DIR)/centos $(BUILD_DIR)/release + cd $(BUILD_DIR)/centos && bsdtar -xf ../$(shell basename $(CENTISO)) # modify the installer iso's contents - @chmod -R u+w centos - @cp -f isolinux.cfg centos/isolinux/isolinux.cfg - @ln $(RPMCOM) centos/Packages - @ln $(RPMUDR) centos/Packages - @ln $(RPMODL) centos/Packages - @ln $(RPMONO) centos/Packages + @chmod -R u+w $(BUILD_DIR)/centos + @cp -f isolinux.cfg $(BUILD_DIR)/centos/isolinux/isolinux.cfg + @ln $(RPMCOM) $(BUILD_DIR)/centos/Packages + @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages + @ln $(RPMODL) $(BUILD_DIR)/centos/Packages + @ln $(RPMONO) $(BUILD_DIR)/centos/Packages # add packages to the centos packages - cd centos/Packages && yumdownloader openvswitch - cd centos/Packages && yumdownloader openstack-tripleo - cd centos/Packages && yumdownloader jq - cd centos/Packages && yumdownloader python34 - cd centos/Packages && yumdownloader python34-libs - cd centos/Packages && yumdownloader python34-yaml - cd centos/Packages && yumdownloader python34-setuptools - cd centos/Packages && yumdownloader ipxe-roms-qemu - cd centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm - cd centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm - cd centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-yaml python34-setuptools ipxe-roms-qemu + cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm # regenerate yum repo data @echo "Generating new yum metadata" - createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos + createrepo --update -g $(BUILD_ROOT)/c7-opnfv-x86_64-comps.xml $(BUILD_DIR)/centos # build the iso @echo "Building OPNFV iso" - mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -V "OPNFV CentOS 7 x86_64" -R -J -v -T -o $(ISO) centos + mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -V "OPNFV CentOS 7 x86_64" -R -J -v -T -o $(ISO) $(BUILD_DIR)/centos isohybrid $(ISO) @printf "\n\nISO is built at $(ISO)\n\n" @@ -397,37 +344,27 @@ iso: iso-clean images rpms $(CENTISO) #################### .PHONY: python3-jinja2 -python3-jinja2: python3-markupsafe python-jinja2-2.8-5.fc24.src.rpm - curl -O http://ftp.linux.ncsu.edu/pub/fedora/linux//development/24/Everything/source/tree/Packages/p/python-jinja2-2.8-5.fc24.src.rpm - rpm2cpio python-jinja2-2.8-5.fc24.src.rpm | cpio -idmv - sed -i 's/python3-devel/python34-devel/' python-jinja2.spec - sed -i 's/python3-setuptools/python34-setuptools/' python-jinja2.spec - sed -i 's/python3-pytest/python34-pytest/' python-jinja2.spec - sed -i 's/python3-markupsafe/python34-markupsafe/' python-jinja2.spec - rpmbuild -ba python-jinja2.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 "with_python3 1" - -.PHONY: python3-jinja2-clean -python3-jinja2-clean: - rm -f python-jinja2-2.8-5.fc24.src.rpm - rm -f python-jinja2.spec - rm -f Jinja2-2.8.tar.gz +python3-jinja2: python3-markupsafe + cd $(BUILD_DIR) \ + && curl -O -L artifacts.opnfv.org/apex/dependencies/python-jinja2-2.8-5.fc24.src.rpm \ + && rpm2cpio python-jinja2-2.8-5.fc24.src.rpm | cpio -idmv \ + && sed -i 's/python3-devel/python34-devel/' python-jinja2.spec \ + && sed -i 's/python3-setuptools/python34-setuptools/' python-jinja2.spec \ + && sed -i 's/python3-pytest/python34-pytest/' python-jinja2.spec \ + && sed -i 's/python3-markupsafe/python34-markupsafe/' python-jinja2.spec \ + && rpmbuild -ba python-jinja2.spec $(RPM_DIR_ARGS) -D "with_python3 1" ######################## # python3-markupsafe # ######################## .PHONY: python3-markupsafe -python3-markupsafe: python-markupsafe-0.23-9.fc24.src.rpm - curl -O http://ftp.linux.ncsu.edu/pub/fedora/linux//development/24/Everything/source/tree/Packages/p/python-markupsafe-0.23-9.fc24.src.rpm - rpm2cpio python-markupsafe-0.23-9.fc24.src.rpm | cpio -idmv - sed -i 's/python3-devel/python34-devel/' python-markupsafe.spec - sed -i 's/python3-setuptools/python34-setuptools/' python-markupsafe.spec - sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec - sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec - rpmbuild -ba python-markupsafe.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 "with_python3 1" - -.PHONY: python3-markupsafe-clean -python3-markupsafe-clean: - rm -f python-markupsafe-0.23-9.fc24.src.rpm - rm -f python-markupsafe.spec - rm -f MarkupSafe-0.23.tar.gz +python3-markupsafe: + cd $(BUILD_DIR) \ + && curl -O -L artifacts.opnfv.org/apex/dependencies/python-markupsafe-0.23-9.fc24.src.rpm \ + && rpm2cpio python-markupsafe-0.23-9.fc24.src.rpm | cpio -idmv \ + && sed -i 's/python3-devel/python34-devel/' python-markupsafe.spec \ + && sed -i 's/python3-setuptools/python34-setuptools/' python-markupsafe.spec \ + && sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec \ + && sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec \ + && rpmbuild -ba python-markupsafe.spec $(RPM_DIR_ARGS) -D "with_python3 1" |