summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-05-05 16:51:02 -0400
committerDan Radez <dradez@redhat.com>2017-06-22 16:37:59 -0400
commit586110a27dc11e89a5ff3552f3215e8a0716aa92 (patch)
treee1fa6054d3f8077f114675d8de2b5da4a302a374 /ci
parentff9beeb45e7d25aedf2d25644497b0468a96ee16 (diff)
Adding conditionals dependent on arch
There are x86 specific build items that can't be used when building on aarch64. Adding conditionals so that the items only get built in when building on x86_64. There are aarch64 specific settings that need to be set for deployment. JIRA: APEX-381 Change-Id: I63e1c99d5d22bbb523c88be7e973a6c834a38b01 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/clean.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
index bd48c0d..fba1f12 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -89,7 +89,7 @@ fi
# Clean off instack/undercloud VM
for vm in instack undercloud; do
virsh destroy $vm 2> /dev/null | xargs echo -n
- virsh undefine $vm 2> /dev/null | xargs echo -n
+ virsh undefine --nvram $vm 2> /dev/null | xargs echo -n
/usr/bin/touch /var/lib/libvirt/images/${vm}.qcow2
virsh vol-delete ${vm}.qcow2 --pool default 2> /dev/null | xargs echo -n
rm -f /var/lib/libvirt/images/${vm}.qcow2 2> /dev/null