From a801536f334b859e6165f2788c363af704e459ba Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 1 Mar 2018 14:29:13 +0000 Subject: [PATCH] xci: Do not fail the job if virsh command fails Change-Id: Ie5fae322f98ec6c9c2236486642c0d71c6a04aae Signed-off-by: Fatih Degirmenci --- jjb/xci/osa-periodic-jobs.yml | 4 ++-- jjb/xci/xci-cleanup.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml index cf4916bde..e604a0a03 100644 --- a/jjb/xci/osa-periodic-jobs.yml +++ b/jjb/xci/osa-periodic-jobs.yml @@ -247,8 +247,8 @@ - shell: | #!/bin/bash - sudo virsh destroy ${DISTRO}_xci_vm - sudo virsh undefine ${DISTRO}_xci_vm + sudo virsh destroy ${DISTRO}_xci_vm || true + sudo virsh undefine ${DISTRO}_xci_vm || true # this will be enabled once the xci is prepared # - builder: diff --git a/jjb/xci/xci-cleanup.sh b/jjb/xci/xci-cleanup.sh index 45b4ec273..ce84830aa 100755 --- a/jjb/xci/xci-cleanup.sh +++ b/jjb/xci/xci-cleanup.sh @@ -20,5 +20,5 @@ if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then exit 0 fi -sudo virsh destroy ${DISTRO}_xci_vm -sudo virsh undefine ${DISTRO}_xci_vm +sudo virsh destroy ${DISTRO}_xci_vm || true +sudo virsh undefine ${DISTRO}_xci_vm || true -- 2.16.6