summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-22 08:25:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 08:25:33 +0000
commit2e2779549879b01c994f5e2685179f0d2ce319fc (patch)
tree97d1329ec63049b9bb34fc9c6690b7427147b8da /build/Makefile
parent9e8b5e9f68dde6c427d0617a7cf4b932a802b923 (diff)
parented90b347e4228477f419a1b483f3997639665fef (diff)
Merge "adding SFC overcloud image"
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile
index b0b895a1..ecfd154f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -143,8 +143,10 @@ rpm:
nics/compute_private_storage.yaml instackenv-virt.json instackenv.json.example
rpmbuild -ba 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 $(REVSTATE) | tr -d '_-')"
# build the overcloud RPM
- tar -czf opnfv-apex.tar.gz --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" stack/overcloud-full-odl.qcow2
+ tar -czf opnfv-apex.tar.gz --xform="s:stack/overcloud-full-opendaylight.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full-opendaylight.qcow2:" stack/overcloud-full-opendaylight.qcow2
rpmbuild -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 $(REVSTATE) | tr -d '_-')"
+ tar -czf opnfv-apex-opendaylight-sfc.tar.gz --xform="s:stack/overcloud-full-opendaylight-sfc.qcow2:opnfv-apex-opendaylight-sfc-$(RPMVERS)/build/stack/overcloud-full-opendaylight-sfc.qcow2:" stack/overcloud-full-opendaylight-sfc.qcow2
+ rpmbuild -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 $(REVSTATE) | tr -d '_-')"
.PHONY: instack
instack:
@@ -159,6 +161,7 @@ instack-clean:
rm -f baremetalbrbm_brbm1_brbm2_brbm3_3.xml
rm -f baremetalbrbm_brbm1_brbm2_brbm3_4.xml
rm -f instack.xml
+ rm -rf stack/onos
.PHONY: iso
iso: build-clean instack rpm $(ISOCACHE)