|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v7 05/15] distros: support PV guest install from Debian netinst media.
The netinst media are iso images containing a base Debian install and
some (image size dependent) additional tasks.
On x86 the "multiarch" iso flavour contains a Xen capable kernel for
both i386 and amd64 so use that.
This adds support for two classes of ISO, the CD sized ones which are
built nightly and the DVD sized ones which are built weekly.
The images are downloaded using jigdo which sources the majority of
the data from a local Debian mirror, for this reason I have not
worried about the fact that the i386 and amd64 tests are downloading
the same thing (adding a specific download job would require finding
up to 4GB of scratch space for each flight).
The ISOs booted using pygrub which can extract the kernel and initrd
from a ISO image. The resulting guests are also booted with pygrub
since the pv-grub-menu package is not available on the ISO images and
we have pvgrub coverage from the netboot tests.
This is configured from make*flight using runvars:
- <gident>_netinst_baseurl:
Base URL of directory containing the netinst jigdo images.
- <gident>_netinst_filere:
Regular expression to match actual file within baseurl to use
(without .jigdo suffix)
<gident>_netinst_kernel:
Path to kernel within the netinst image
<gident>_netinst_ramdisk
Path to ramdisk within the netinst image
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
v7: Use {Guest}_suite not {Guest}_dist as runvar to choose version.
Use shorter lined method for $arch_props definition
Switch to flight-per-suite model
Handle lack of both $c{DebianMirrorProxy} and $c{HttpProxy}
Construct URLs in make-distros-flight
v4: Support http_proxy in jigdo download
v3:
- Indent jigdo-lite script line to improve readability
- Wrap bootloader_args
- Fetch URL on target, to get a timeout. Use wget since that is arranged to
be present.
- include bootloader in test name.
---
Osstest/Debian.pm | 7 ++++--
make-distros-flight | 54 ++++++++++++++++++++++++++++++++++++++++++++
ts-debian-di-install | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+), 2 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 0975e73..30b1b3a 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -623,8 +623,6 @@ sub preseed_base ($$$$;@) {
preseed_hook_overlay($ho, $sfx, $c{OverlayLocal}, 'overlay-local.tar');
my $preseed = <<"END";
-d-i mirror/suite string $suite
-
d-i debian-installer/locale string en_GB
d-i console-keymaps-at/keymap select gb
d-i keyboard-configuration/xkb-keymap string en_GB
@@ -696,6 +694,11 @@ END
d-i clock-setup/ntp-server string $ntpserver
END
+ # For CDROM the suite is part of the image
+ $preseed .= <<END unless $xopts{CDROM};
+d-i mirror/suite string $suite
+END
+
$preseed .= <<"END";
### END OF DEBIAN PRESEED BASE
diff --git a/make-distros-flight b/make-distros-flight
index 06b14f2..4b9f100 100755
--- a/make-distros-flight
+++ b/make-distros-flight
@@ -115,6 +115,48 @@ test_do_one_netboot () {
all_hostflags=$most_hostflags
}
+test_do_one_netinst () {
+ local path_arch
+ case $domU in
+ amd64|i386) path_arch="multi-arch"; file_arch="amd64-i386";;
+ *) path_arch="$domU"; file_arch="$domU";;
+ esac
+ case $domU in
+ amd64) iso_path="/install.amd/xen";;
+ i386) iso_path="/install.386/xen";;
+ *) iso_path="/install.$domU";;
+ esac
+
+ local cdurl=
+ case $cd in
+ current)
+ cdurl="http://cdimage.debian.org/debian-cd/current/${path_arch}/jigdo-cd";
+ ;;
+ weekly)
+
cdurl="http://cdimage.debian.org/cdimage/weekly-builds/${path_arch}/jigdo-cd";
+ ;;
+ *)
+ echo "cd $cd?"
+ exit 1
+ ;;
+ esac
+
+ # Always pygrub since no pv-grub-menu on CD
+ job_create_test \
+ test-$xenarch$kern-$dom0arch-$domU-$cd-netinst-pygrub \
+ test-debian-di xl $xenarch $dom0arch \
+ kernbuildjob=${bfi}build-$dom0arch-$kernbuild \
+ debian_arch=$domU \
+ debian_method=netinst \
+ debian_netinst_baseurl=$cdurl \
+ debian_netinst_filere="debian-.*-${file_arch}-netinst" \
+ debian_netinst_kernel="${iso_path}/vmlinuz" \
+ debian_netinst_ramdisk="${iso_path}/initrd.gz" \
+ debian_bootloader=pygrub \
+ all_hostflags=$most_hostflags
+
+}
+
test_matrix_do_one () {
case ${xenarch} in
amd64) domUarches="amd64 i386";;
@@ -130,6 +172,18 @@ test_matrix_do_one () {
fi
+ if [ $debian_suite = "snapshot" ]; then
+ gsuite=sid
+ for cd in current weekly ; do
+ case ${domU}_${gsuite} in
+ armhf_*) continue;; # No iso targets for armhf
+ *) ;;
+ esac
+
+ test_do_one_netinst
+
+ done
+ fi
done
}
diff --git a/ts-debian-di-install b/ts-debian-di-install
index 14167c8..22c1930 100755
--- a/ts-debian-di-install
+++ b/ts-debian-di-install
@@ -46,6 +46,60 @@ sub prep () {
target_cmd_root($ho, "umount $gho->{Lvdev} ||:");
}
+sub setup_netinst($$$)
+{
+ my ($didir, $arch, $cd) = @_;
+
+ target_install_packages($ho, qw(jigdo-file));
+
+ my $baseurl = $r{ "$gho->{Guest}_netinst_baseurl" };
+ my $filere = $r{ "$gho->{Guest}_netinst_filere" };
+ my $kernel = $r{ "$gho->{Guest}_netinst_kernel" };
+ my $ramdisk = $r{ "$gho->{Guest}_netinst_ramdisk" };
+
+ die "params" unless $baseurl && $filere && $kernel && $ramdisk;
+
+ my $filebase;
+
+ # Use the MD5SUMs file as an index
+ logm("Fetch index from $baseurl/MD5SUMS");
+ my $idx = target_cmd_output_root($ho, "wget --quiet -O -
$baseurl/MD5SUMS");
+ foreach (split /\n/, $idx) {
+ m/^[0-9a-f]{32} ($filere)\.iso$/ or next;
+ $filebase = $1;
+ last;
+ }
+
+ die unless $filebase;
+
+ logm("Downloading $baseurl/$filebase.jigdo");
+ my $netinst_jigdo = "$baseurl/$filebase.jigdo";
+ # Jigdo uses wget internally, and so obeys $http_proxy. This seems
+ # simpler than the advice at
+ # https://www.debian.org/CD/jigdo-cd/#faq which is to edit
+ # ~/.jigdo-lite and change the wgetOpts setting.
+ my $useproxy = $c{DebianMirrorProxy} // $c{HttpProxy} // '';
+ my $cmd = '';
+ $cmd .= <<END if $useproxy;
+ export http_proxy=$useproxy
+END
+ $cmd .= <<END;
+ cd $didir && jigdo-lite --noask $netinst_jigdo
+END
+ # Jigdo seems to use /etc/apt/sources.list or something, so this
+ # just works using the already configured mirror without
+ # additional configuration, which is good because there doesn't
+ # seem to be any support for such things, at least in Squeeze.
+ target_cmd_root($ho, $cmd, 3600);
+ store_runvar("$gho->{Guest}_netinst_jigdo", $netinst_jigdo);
+
+ return (<<END, "\"file:$didir/$filebase.iso,xvdd:cdrom,r\",");
+bootloader = "pygrub"
+bootloader_args = ["--kernel=$kernel",
+ "--ramdisk=$ramdisk"]
+END
+}
+
sub setup_netboot($$$)
{
my ($didir, $arch, $suite) = @_;
@@ -108,6 +162,16 @@ END
$extra_disk = "";
}
+ elsif ($method eq "netinst" )
+ {
+ my $cd = $r{"$gho->{Guest}_cd"};
+
+ logm("$method $cd/$arch");
+
+ ($method_cfg,$extra_disk) = setup_netinst($tmpdir, $arch, $cd);
+
+ $ps_url = preseed_create_guest($gho, '', CDROM=>1);
+ }
else
{
die "$method";
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |