[lxc-devel] [PATCH] tests: Copy the download cache when available [v2]
Serge Hallyn
serge.hallyn at ubuntu.com
Mon Aug 25 21:02:03 UTC 2014
Quoting Stéphane Graber (stgraber at ubuntu.com):
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
> ---
> src/tests/lxc-test-unpriv | 6 ++++++
> src/tests/lxc-test-usernic.in | 7 +++++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
> index 6242c5f..59c2640 100755
> --- a/src/tests/lxc-test-unpriv
> +++ b/src/tests/lxc-test-unpriv
> @@ -114,6 +114,12 @@ else
> done
> fi
>
> +# Copy the download template cache if available
> +run_cmd mkdir -p $HDIR/.cache/lxc
> +[ -d /var/cache/lxc/download ] && \
> + cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \
> + chown -R $TUSER: $HDIR/.cache/lxc
> +
> run_cmd lxc-create -t download -n c1 -- -d ubuntu -r trusty -a $ARCH
> run_cmd lxc-start -n c1 -d
>
> diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
> index 395c453..7955d4f 100755
> --- a/src/tests/lxc-test-usernic.in
> +++ b/src/tests/lxc-test-usernic.in
> @@ -109,6 +109,13 @@ fi
> mkdir -p /run/user/$(id -u usernic-user)
> chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user
>
> +# Copy the download template cache if available
> +run_cmd "mkdir -p /home/usernic-user/.cache/lxc"
> +[ -d /var/cache/lxc/download ] && \
> + cp -R /var/cache/lxc/download /home/usernic-user/.cache/lxc && \
> + chown -R usernic-user: /home/usernic-user/.cache/lxc
> +
> +
> # Create two test bridges
> brctl addbr usernic-br0
> brctl addbr usernic-br1
> --
> 1.9.1
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
More information about the lxc-devel
mailing list