diff options
| author | Philip Hands <phil@hands.com> | 2016-05-14 22:03:14 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-05-14 23:04:27 +0200 |
| commit | 183047ae67b06004bdef17561678e5021c9b5a19 (patch) | |
| tree | 124279fc9ffa5275d9195383e8ca8989122b68eb | |
| parent | 306b243742aab4f21925cbd4d171702fb56e9083 (diff) | |
| download | jenkins.debian.net-183047ae67b06004bdef17561678e5021c9b5a19.tar.xz | |
lvc: discard snapshots if target volume is missing
| -rwxr-xr-x | bin/lvc.sh | 12 | ||||
| -rw-r--r-- | hosts/jenkins-test-vm/etc/sudoers.d/jenkins | 1 | ||||
| -rw-r--r-- | hosts/jenkins/etc/sudoers.d/jenkins | 1 |
3 files changed, 14 insertions, 0 deletions
@@ -30,6 +30,13 @@ fetch_if_newer() { curl $curlopts -o $file $url } +discard_snapshots() { + domain=$1 + for snap in $(sudo /usr/bin/virsh snapshot-list $domain --name) ; do + sudo /usr/bin/virsh snapshot-delete $domain $snap + done +} + # # define workspace + results # @@ -43,6 +50,11 @@ mkdir -p $RESULTS mkdir -p $WORKSPACE/DebianToasterStorage +# FIXME this should discover the 'target' bit of the path, probably via: virsh vol-list +if [ ! -e "$WORKSPACE/DebianToasterStorage/target" ] ; then + discard_snapshots DebianToaster +fi + trap cleanup_all INT TERM EXIT # diff --git a/hosts/jenkins-test-vm/etc/sudoers.d/jenkins b/hosts/jenkins-test-vm/etc/sudoers.d/jenkins index 96d501ef..1f457531 100644 --- a/hosts/jenkins-test-vm/etc/sudoers.d/jenkins +++ b/hosts/jenkins-test-vm/etc/sudoers.d/jenkins @@ -28,6 +28,7 @@ jenkins ALL= \ /usr/bin/qemu-system-x86_64 *, \ /usr/bin/qemu-img *, \ /sbin/lvcreate *, /sbin/lvremove *, \ + /usr/bin/virsh snapshot-list *, /usr/bin/virsh snapshot-delete *, \ /bin/mkdir -p /media/*, \ /usr/bin/guestmount *, \ /bin/cp -rv /media/*, \ diff --git a/hosts/jenkins/etc/sudoers.d/jenkins b/hosts/jenkins/etc/sudoers.d/jenkins index 96d501ef..c1ad0ff1 100644 --- a/hosts/jenkins/etc/sudoers.d/jenkins +++ b/hosts/jenkins/etc/sudoers.d/jenkins @@ -28,6 +28,7 @@ jenkins ALL= \ /usr/bin/qemu-system-x86_64 *, \ /usr/bin/qemu-img *, \ /sbin/lvcreate *, /sbin/lvremove *, \ + /usr/vib/virsh *, \ /bin/mkdir -p /media/*, \ /usr/bin/guestmount *, \ /bin/cp -rv /media/*, \ |