summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml4
-rw-r--r--pkg/machine/qemu/machine.go3
2 files changed, 5 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 480dcb21e..c984c8859 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -776,8 +776,8 @@ image_build_task: &image-build
test_image_build_task:
<<: *image-build
- # Allow this to run inside a PR
- only_if: $CI == $CI
+ # Allow this to run inside a PR w/ [CI:BUILD]
+ only_if: $CIRRUS_PR != '' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
# This takes a LONG time, only run when requested. N/B: Any task
# made to depend on this one will block FOREVER unless triggered.
trigger_type: manual
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index e849bae3f..321c1b99c 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -859,6 +859,9 @@ func (v *MachineVM) Remove(_ string, opts machine.RemoveOptions) (string, func()
return confirmationMessage, func() error {
for _, f := range files {
if err := os.Remove(f); err != nil {
+ if errors.Is(err, os.ErrNotExist) {
+ continue
+ }
logrus.Error(err)
}
}