diff options
| -rw-r--r-- | build/Makefile | 51 | ||||
| -rwxr-xr-x | ci/build.sh | 43 |
2 files changed, 74 insertions, 20 deletions
diff --git a/build/Makefile b/build/Makefile index 36c6e696..e7def26f 100644 --- a/build/Makefile +++ b/build/Makefile @@ -41,13 +41,19 @@ rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rp .PHONY: rpms-clean rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean opendaylight-sfc-rpm-clean +opnfv-apex-common.tar.gz: + pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz + +.PHONY: common-rpm-check +common-rpm-check: opnfv-apex-common.tar.gz + rpmbuild --clean -bi -bl 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 -common-rpm: $(RPMCOM) +common-rpm: opnfv-apex-common.tar.gz $(RPMCOM) $(RPMCOM): @echo "Building the Apex Common RPM" # build the common RPM - pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz rpmbuild --clean -ba 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 '_-')" ############### @@ -65,10 +71,7 @@ images/undercloud.qcow2: @echo "Building the Apex Undercloud Image" @./undercloud.sh -.PHONY: undercloud-rpm-prep -undercloud-rpm-prep: opnfv-apex-undercloud.tar - -opnfv-apex-undercloud.tar: images/undercloud.qcow2 +opnfv-apex-undercloud.tar.gz: images/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 \ @@ -76,11 +79,11 @@ opnfv-apex-undercloud.tar: images/undercloud.qcow2 gzip -f opnfv-apex-undercloud.tar .PHONY: undercloud-rpm-check -undercloud-rpm-check: undercloud-rpm-prep - rpmbuild --clean -bi -bl 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: opnfv-apex-undercloud.tar.gz + rpmbuild --clean -bi -bl 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 -undercloud-rpm: images/undercloud.qcow2 $(RPMUDR) +undercloud-rpm: opnfv-apex-undercloud.tar.gz $(RPMUDR) $(RPMUDR): @echo "Building the Apex Undercloud RPM" @@ -117,13 +120,19 @@ images/overcloud-full-opendaylight.qcow2: images/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 + +.PHONY: opendaylight-rpm-check +opendaylight-rpm-check: opnfv-apex.tar.gz + rpmbuild --clean -bi -bl 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 -opendaylight-rpm: overcloud-opendaylight $(RPMODL) +opendaylight-rpm: opnfv-apex.tar.gz $(RPMODL) $(RPMODL): @echo "Building the Apex OpenDaylight RPM" # build the overcloud RPM - 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 rpmbuild --clean -ba 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 '_-')" ############### @@ -147,13 +156,19 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2 onos-rpm-clean: @rpmbuild --clean opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')" +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 + +.PHONY: onos-rpm-check +onos-rpm-check: opnfv-apex-onos.tar.gz + rpmbuild --clean -bi -bl 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 '_-')" + .PHONY: onos-rpm -onos-rpm: overcloud-onos $(RPMONO) +onos-rpm: opnfv-apex-onos.tar.gz $(RPMONO) $(RPMONO): @echo "Building the Apex ONOS RPM" # build the overcloud RPM - 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 rpmbuild --clean -ba 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 '_-')" ############### @@ -171,12 +186,18 @@ images/overcloud-full-opendaylight-sfc.qcow2: images/overcloud-full-opendaylight @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 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: overcloud-opendaylight-sfc $(RPMSFC) +opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC) $(RPMSFC): @echo "Building the Apex OpenDaylight SFC RPM" - 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 rpmbuild --clean -ba 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 '_-')" ############### diff --git a/ci/build.sh b/ci/build.sh index b5bfc8ca..2fd8c26d 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -34,7 +34,7 @@ BUILD_BASE=$(readlink -e ../build/) CACHE_DEST="" CACHE_DIR="cache" CACHE_NAME="apex-cache" -MAKE_TARGET="images" +MAKE_TARGETS="images" parse_cmdline() { while [ "${1:0:1}" = "-" ] @@ -53,12 +53,12 @@ parse_cmdline() { shift 2 ;; --iso ) - MAKE_TARGET="iso" + MAKE_TARGETS="iso" echo "Building opnfv-apex RPMs and ISO" shift 1 ;; --rpms ) - MAKE_TARGET="rpms" + MAKE_TARGETS="rpms" echo "Buiding opnfv-apex RPMs" shift 1 ;; @@ -76,6 +76,10 @@ parse_cmdline() { } +run_make() { + make $MAKE_ARGS -C ${BUILD_BASE} $1 +} + parse_cmdline "$@" if [ -n "$RELEASE" ]; then MAKE_ARGS+="RELEASE=$RELEASE "; fi @@ -98,8 +102,37 @@ if [[ ! -d ../build_output ]]; then ln -s build/noarch/ ../build_output fi -# Execute Make -make $MAKE_ARGS -C ${BUILD_BASE} $MAKE_TARGET +# Conditionally execute RPM build checks if the specs change and target is not rpm or iso +if [[ "$MAKE_TARGETS" == "images" ]]; then + commit_file_list=$(git show --pretty="format:" --name-only) + if [[ $commit_file_list == *build/Makefile* ]]; then + # Makefile forces all rpms to be checked + MAKE_TARGETS+=" rpms-check" + else + # Spec files are selective + if [[ $commit_file_list == *build/opnfv-apex-undercloud.spec* ]]; then + MAKE_TARGETS+=" undercloud-rpm-check" + fi + if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then + MAKE_TARGETS+=" common-rpm-check" + fi + if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then + MAKE_TARGETS+=" opendaylight-rpm-check" + fi + if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then + MAKE_TARGETS+=" onos-rpm-check" + fi + if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then + MAKE_TARGETS+=" opendaylight-sfc-rpm-check" + fi + fi +fi + +# Execute make against targets +for t in $MAKE_TARGETS; do + run_make $t +done + echo "Build Complete" # Build new Cache |