[OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Ian Jackson]

---
 make-flight |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-flight b/make-flight
index 056fc7a..033c3f0 100755
--- a/make-flight
+++ b/make-flight
@@ -108,7 +108,7 @@ do_freebsd_tests () {
  job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
                         test-freebsd xl $xenarch $dom0arch \
                         freebsd_arch=$freebsdarch \
- freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-BETA3-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20131103-r257580.qcow2.xz} \
+ freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20140116-r260789.qcow2.xz} \
                         all_hostflags=$most_hostflags
 
   done
-- 
1.7.10.4

Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Roger Pau Monné]

On 10/02/14 13:13, Ian Jackson wrote:
> ---
>  make-flight |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/make-flight b/make-flight
> index 056fc7a..033c3f0 100755
> --- a/make-flight
> +++ b/make-flight
> @@ -108,7 +108,7 @@ do_freebsd_tests () {
>   job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
>                          test-freebsd xl $xenarch $dom0arch \
>                          freebsd_arch=$freebsdarch \
> - freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-BETA3-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20131103-r257580.qcow2.xz} \
> + freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.0-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20140116-r260789.qcow2.xz} \
>                          all_hostflags=$most_hostflags
>  
>    done

Thanks for the patch. I think it's missing the following chunk:

---
diff --git a/ts-freebsd-install b/ts-freebsd-install
index 6c6abbe..72542c2 100755
--- a/ts-freebsd-install
+++ b/ts-freebsd-install
@@ -36,7 +36,7 @@ our $gho;

 our $mnt= '/root/freebsd_root';

-our $freebsd_version= "10.0-BETA3";
+our $freebsd_version= "10.0-RELEASE";

 # Folder where the FreeBSD VM images are stored inside of the host
 #

Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Ian Jackson]

Roger Pau Monné writes ("Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)"):
> Thanks for the patch. I think it's missing the following chunk:
...
> -our $freebsd_version= "10.0-BETA3";
> +our $freebsd_version= "10.0-RELEASE";

Oh.  Err, why is this hardcoded in the script ?  Changing the
runvar(s) ought to be sufficient.

... (looks at the code) ...

Oh, I see, that's just the default.  Perhaps the default should be
removed entirely ?  None of the other scripts have a default image
filename.

Ian.

Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Roger Pau Monné]

On 10/02/14 13:26, Ian Jackson wrote:
> Roger Pau Monné writes ("Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)"):
>> Thanks for the patch. I think it's missing the following chunk:
> ...
>> -our $freebsd_version= "10.0-BETA3";
>> +our $freebsd_version= "10.0-RELEASE";
> 
> Oh.  Err, why is this hardcoded in the script ?  Changing the
> runvar(s) ought to be sufficient.
> 
> ... (looks at the code) ...
> 
> Oh, I see, that's just the default.  Perhaps the default should be
> removed entirely ?  None of the other scripts have a default image
> filename.

So $freebsd_image is going to contain the absolute path to the image?
I'm asking because ts-freebsd-install searches for the image in
/var/images, do we have to do something like /var/images/$freebsd_image
in order to get the absolute image path?

Roger.

Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Ian Jackson]

Roger Pau Monné writes ("Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)"):
> On 10/02/14 13:26, Ian Jackson wrote:
> > Roger Pau Monné writes ("Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)"):
> >> Thanks for the patch. I think it's missing the following chunk:
> > ...
> >> -our $freebsd_version= "10.0-BETA3";
> >> +our $freebsd_version= "10.0-RELEASE";
> > 
> > Oh.  Err, why is this hardcoded in the script ?  Changing the
> > runvar(s) ought to be sufficient.
> > 
> > ... (looks at the code) ...
> > 
> > Oh, I see, that's just the default.  Perhaps the default should be
> > removed entirely ?  None of the other scripts have a default image
> > filename.
> 
> So $freebsd_image is going to contain the absolute path to the image?
> I'm asking because ts-freebsd-install searches for the image in
> /var/images, do we have to do something like /var/images/$freebsd_image
> in order to get the absolute image path?

(Sorry for not replying sooner.)

In flights made with make-flight, the runvar $r{freebsd_image} is
always set and is used by target_put_guest_image instead of the third
"default" argument.  So both $freebsd_version and $freebsd_vm_repo are
ignored.

ts-redhat-install and ts-windows-install both use
more_prepareguest_hvm which pass "undef" for the third argument.
So I'm suggesting that the bit of ts-freebsd-install which constructs
the default image filename be removed.

Ian.

Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)

[Ian Jackson]

Ian Jackson writes ("Re: [OSSTEST PATCH] freebsd: switch to 10.0-RELEASE (20140116-r260789)"):
> ts-redhat-install and ts-windows-install both use
> more_prepareguest_hvm which pass "undef" for the third argument.
> So I'm suggesting that the bit of ts-freebsd-install which constructs
> the default image filename be removed.

I have pushed a version of this patch containing only the make-flight
change.  I think that's sufficient.  Changing the fallback
arrangements used when the runvar is missing can wait.

Thanks,
Ian.