summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-10-08 11:00:49 -0400
committerTim Rozet <trozet@redhat.com>2015-10-08 14:39:41 -0400
commit5928e7a63e9bea9a002b5be66535ec45e3b9b1a2 (patch)
tree6214575351d664b742f456cd25e7461e1976972b /build/Makefile
parentd4dc4ba1fa5446d5458ff649d0752384a8322af3 (diff)
Fixes repos and adds errexit checks per radez github commit
Also fixes node vms naming issue where naming is changed from baremetal_x to baremetalbrbm_x in liberty. Change-Id: I8b791d71466d7c5c1037e45839e689a9aac0dd8f Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/build/Makefile b/build/Makefile
index f3757c7..67d0f63 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -100,12 +100,12 @@ rpm:
pushd ../ && git archive --format=tar --prefix=opnfv-apex-2.0/ HEAD > build/opnfv-apex.tar
tar -u --xform="s:instack.qcow2:opnfv-apex-2.0/build/instack.qcow2:" --file=opnfv-apex.tar instack.qcow2
tar -u --xform="s:instack.xml:opnfv-apex-2.0/build/instack.xml:" --file=opnfv-apex.tar instack.xml
- qemu-img create -f qcow2 baremetal_0.qcow2 40G
- tar -u --xform="s:baremetal_0.qcow2:opnfv-apex-2.0/build/baremetal_0.qcow2:" --file=opnfv-apex.tar baremetal_0.qcow2
- tar -u --xform="s:baremetal_0.xml:opnfv-apex-2.0/build/baremetal_0.xml:" --file=opnfv-apex.tar baremetal_0.xml
- qemu-img create -f qcow2 baremetal_1.qcow2 40G
- tar -u --xform="s:baremetal_1.qcow2:opnfv-apex-2.0/build/baremetal_1.qcow2:" --file=opnfv-apex.tar baremetal_1.qcow2
- tar -u --xform="s:baremetal_1.xml:opnfv-apex-2.0/build/baremetal_1.xml:" --file=opnfv-apex.tar baremetal_1.xml
+ qemu-img create -f qcow2 baremetalbrbm_0.qcow2 40G
+ tar -u --xform="s:baremetalbrbm_0.qcow2:opnfv-apex-2.0/build/baremetalbrbm_0.qcow2:" --file=opnfv-apex.tar baremetalbrbm_0.qcow2
+ tar -u --xform="s:baremetalbrbm_0.xml:opnfv-apex-2.0/build/baremetalbrbm_0.xml:" --file=opnfv-apex.tar baremetalbrbm_0.xml
+ qemu-img create -f qcow2 baremetalbrbm_1.qcow2 40G
+ tar -u --xform="s:baremetalbrbm_1.qcow2:opnfv-apex-2.0/build/baremetalbrbm_1.qcow2:" --file=opnfv-apex.tar baremetalbrbm_1.qcow2
+ tar -u --xform="s:baremetalbrbm_1.xml:opnfv-apex-2.0/build/baremetalbrbm_1.xml:" --file=opnfv-apex.tar baremetalbrbm_1.xml
tar -u --xform="s:brbm.xml:opnfv-apex-2.0/build/brbm.xml:" --file=opnfv-apex.tar brbm.xml
tar -u --xform="s:instackenv-virt.json:opnfv-apex-2.0/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json
tar -u --xform="s:stack/deploy-ramdisk-ironic.initramfs:opnfv-apex-2.0/build/stack/deploy-ramdisk-ironic.initramfs:" --file=opnfv-apex.tar stack/deploy-ramdisk-ironic.initramfs
@@ -129,8 +129,8 @@ instack.qcow2:
.PHONY: instack-clean
instack-clean:
rm -f instackenv-virt.json
- rm -f baremetal_0.xml
- rm -f baremetal_1.xml
+ rm -f baremetalbrbm_0.xml
+ rm -f baremetalbrbm_1.xml
rm -f instack.xml
rm -f instack.qcow2
rm -rf stack