fixing PR_NUMBER evaluation when there is no opnfv-tht-pr in the commit message

[apex.git] / build / Makefile

diff --git a/build/Makefile b/build/Makefile
index e7def26..8a498a6 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -12,7 +12,7 @@ export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-
 export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD))
 export RELEASE = "0"
 export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso
-export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | awk '{ print $$2 }')
+export RPMVERS = $(shell grep Version $(shell pwd)/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
@@ -239,7 +239,7 @@ iso:        iso-clean images rpms $(CENTISO)
        @ln $(RPMODL) centos/Packages
        @ln $(RPMONO) centos/Packages
        @ln $(RPMSFC) centos/Packages
-       cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo
+       cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo && yumdownloader jq
        # regenerate yum repo data
        @echo "Generating new yum metadata"
        createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos