Re: [OSSTEST Nested PATCH v10 6/9] Changes on test step of Debian hvm guest install

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-05-13 at 11:36 +0800, longtao.pang wrote:
> 1. The default disk size for guest is '10000M' which is not sufficient
> for nested HVM guest, using larger disk size for nested guest
> to accommodate to nested test requirement, the specific disk_size is
> defined by make-flight.
> 2. Since 'Debain-xxx-.iso' image will be stored in rootfs of L1 guest,
> therefore needs more disk capacity, increase root partition size to
> 10000M.
> 3. In L1 installation context, assign more memory (defined in runvar) to
> it; Since it acts as a nested hypervisor anyway.
> 4. Comment out CDROM entry in sources.list to make HTTP URL entry
> available for L1 hvm guest.
> 5. Enable nestedhvm feature in 'ExtraConfig' for nested job.
> 
> Signed-off-by: longtao.pang <longtaox.pang@intel.com>
> ---
> Changes in v10:
> Based on Ian's v6_patch[04,05,06], use 'preseed_hook_command' to comment out 
> CDROM entry in sources.list to make HTTP URL entry available for hvm guest.
> ---
>  ts-debian-hvm-install |   18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
> index d3413e1..e636b1e 100755
> --- a/ts-debian-hvm-install
> +++ b/ts-debian-hvm-install
> @@ -59,7 +59,7 @@ d-i partman-auto/expert_recipe string \\
>                          use_filesystem{ } filesystem{ vfat } \\
>                          mountpoint{ /boot/efi } \\
>                  . \\
> -                5000 50 5000 ext4 \\
> +                10000 50 10000 ext4 \\
>                          method{ format } format{ } \\
>                          use_filesystem{ } filesystem{ ext4 } \\
>                          mountpoint{ / } \\
> @@ -80,6 +80,8 @@ if [ -e \$b/debian/grubx64.efi ] ; then
>      mkdir -p \$b/boot
>      cp \$b/debian/grubx64.efi \$b/boot/bootx64.efi
>  fi
> +
> +in-target sed -i 's/^deb *cdrom/#&/g' /etc/apt/sources.list

In the current osstest production this is at the end of:

preseed_hook_command($gho, 'late_command', '', <<END) if $gsuite =~ /wheezy/;

i.e. it is only done on wheezy (since it is a workaround for a Debian
specific issue).

So you need to add another use of preseed_hook_command to add your new
command.

> @@ -164,13 +170,19 @@ sub prep () {
>      if ($host_freemem_mb > $ram_lots * 2 + $ram_minslop) {
>          $ram_mb = $ram_lots;
>      } else {
> -        $ram_mb = 768;
> +        # Use guest_var to get specific memsize, or will use default '768'
> +        $ram_mb= guest_var($gho,'memsize',768);
>      }
> -    logm("Host has $host_freemem_mb MB free memory, setting guest memory size to $ram_mb MB");
> +    logm("Host has $host_freemem_mb MB free memory,
> +         setting guest memory size to $ram_mb MB");

I'm not sure what this will output, but I expect it has far too many
spaces between "," and "setting".

e.g. 
print("AAA
       BBB");
produces:
AAA
       BBB

I think you need to close and reopen the quotes and paste the two
together with . or, better, just leave the log message unwrapped
(wrapping also breaks grep...).

Ian.