[Qemu-devel] [PATCH] tests/vm: Clean out old working directories on build

[Qemu-devel] [PATCH] tests/vm: Clean out old working directories on build

[Peter Maydell]

When we do a build inside one of the BSD VMs, first
delete any stale old build directories from the VM's
/var/tmp. This prevents the VM from running out of
disk space after it has been used for a dozen or
so builds.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
The Ubuntu test VM has a similar issue, but it doesn't
put its test build directories in /var/tmp/ like the
BSDs, and I don't use it so I'm not sure what the right
rm command would be. Somebody else can fix it if they care...

Disclaimer: not actually tested yet, but obviously it will
get tested as part of applying it to master, which I'd
like to do so my pullrequest tests don't keep getting
tripped up by this bug.

 tests/vm/freebsd | 1 +
 tests/vm/netbsd  | 1 +
 tests/vm/openbsd | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 0a6ec4614a7..b6983127d09 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -20,6 +20,7 @@ class FreeBSDVM(basevm.BaseVM):
     name = "freebsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/vtbd1;
         ./configure {configure_opts};
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index 45c9260dc0d..a4e25820d50 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -20,6 +20,7 @@ class NetBSDVM(basevm.BaseVM):
     name = "netbsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/rld1a;
         ./configure --python=python2.7 {configure_opts};
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 98edfbca4ba..52500ee52bb 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -20,6 +20,7 @@ class OpenBSDVM(basevm.BaseVM):
     name = "openbsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/rsd1c;
         ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts};
-- 
2.18.0

Re: [Qemu-devel] [PATCH] tests/vm: Clean out old working directories on build

[Fam Zheng]

On Mon, 08/20 13:48, Peter Maydell wrote:
> When we do a build inside one of the BSD VMs, first
> delete any stale old build directories from the VM's
> /var/tmp. This prevents the VM from running out of
> disk space after it has been used for a dozen or
> so builds.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> The Ubuntu test VM has a similar issue, but it doesn't
> put its test build directories in /var/tmp/ like the
> BSDs, and I don't use it so I'm not sure what the right
> rm command would be. Somebody else can fix it if they care...
> 
> Disclaimer: not actually tested yet, but obviously it will
> get tested as part of applying it to master, which I'd
> like to do so my pullrequest tests don't keep getting
> tripped up by this bug.

Reviewed-by: Fam Zheng <famz@redhat.com>

Please merge this yourself if it helps your pull request handling workflow.

> 
>  tests/vm/freebsd | 1 +
>  tests/vm/netbsd  | 1 +
>  tests/vm/openbsd | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> index 0a6ec4614a7..b6983127d09 100755
> --- a/tests/vm/freebsd
> +++ b/tests/vm/freebsd
> @@ -20,6 +20,7 @@ class FreeBSDVM(basevm.BaseVM):
>      name = "freebsd"
>      BUILD_SCRIPT = """
>          set -e;
> +        rm -rf /var/tmp/qemu-test.*
>          cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
>          tar -xf /dev/vtbd1;
>          ./configure {configure_opts};
> diff --git a/tests/vm/netbsd b/tests/vm/netbsd
> index 45c9260dc0d..a4e25820d50 100755
> --- a/tests/vm/netbsd
> +++ b/tests/vm/netbsd
> @@ -20,6 +20,7 @@ class NetBSDVM(basevm.BaseVM):
>      name = "netbsd"
>      BUILD_SCRIPT = """
>          set -e;
> +        rm -rf /var/tmp/qemu-test.*
>          cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
>          tar -xf /dev/rld1a;
>          ./configure --python=python2.7 {configure_opts};
> diff --git a/tests/vm/openbsd b/tests/vm/openbsd
> index 98edfbca4ba..52500ee52bb 100755
> --- a/tests/vm/openbsd
> +++ b/tests/vm/openbsd
> @@ -20,6 +20,7 @@ class OpenBSDVM(basevm.BaseVM):
>      name = "openbsd"
>      BUILD_SCRIPT = """
>          set -e;
> +        rm -rf /var/tmp/qemu-test.*
>          cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
>          tar -xf /dev/rsd1c;
>          ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts};
> -- 
> 2.18.0
> 
> 

Re: [Qemu-devel] [PATCH] tests/vm: Clean out old working directories on build

[Peter Maydell]

On 20 August 2018 at 14:31, Fam Zheng <famz@redhat.com> wrote:
> On Mon, 08/20 13:48, Peter Maydell wrote:
>> When we do a build inside one of the BSD VMs, first
>> delete any stale old build directories from the VM's
>> /var/tmp. This prevents the VM from running out of
>> disk space after it has been used for a dozen or
>> so builds.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> The Ubuntu test VM has a similar issue, but it doesn't
>> put its test build directories in /var/tmp/ like the
>> BSDs, and I don't use it so I'm not sure what the right
>> rm command would be. Somebody else can fix it if they care...
>>
>> Disclaimer: not actually tested yet, but obviously it will
>> get tested as part of applying it to master, which I'd
>> like to do so my pullrequest tests don't keep getting
>> tripped up by this bug.
>
> Reviewed-by: Fam Zheng <famz@redhat.com>
>
> Please merge this yourself if it helps your pull request handling workflow.

Thanks; I've applied it to master. We can probably
come up with a cleaner approach with disk snapshots,
but this will suffice to avoid build failures in
the meantime.

-- PMM