* [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
@ 2013-09-04 16:57 Ian Campbell
2013-09-04 16:58 ` [PATCH 01/10] README: Point to current test report mail Ian Campbell
` (12 more replies)
0 siblings, 13 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:57 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
Hi Ian,
The following patches add support to osstest for running ts-host-install
against a Calxeda Midway box.
I am running in standalone mode, I hope it will be easy enough for you
to integrate into the live system.
My .xen-osstest/config contains:
HostProp_marilith-n4_Suite wheezy
HostProp_marilith-n4_DIFrontend newt
HostProp_marilith-n4_PowerMethod xenuse
HostProp_marilith-n4_SerialConsole ttyAMA0
HostFlags_marilith-n4 need-kernel-deb-armmp,no-di-kernel,need-uboot-bootscr
marilith-n4 is the Calxeda node. I have other stuff in my config too but
I think it all relates to standalone mode on my box rather than this
host specifically (stooge into ~ianc/.xen-osstest/config on the NFS home
dirs if you want a look, nothing private there).
With this I can run ./standalone-reset and then:
OSSTEST_JOB=test-armhf-armhf-xl ./ts-host-install
host=marilith-n4
Obviously this is just a first step. I'll be working my way down the
columns of http://www.chiark.greenend.org.uk/~xensrcts/logs/18778/ ...
I'm still not entirely sure how one defines a suitable column for armhf,
hopefully you can help when the time comes. For now I am going to look
at host-build-prep then xen-build. After that it looks like
xen-build-check and xen-install would be the interesting ones.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 01/10] README: Point to current test report mail
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 02/10] Allow hyphen in host names when parsing properties Ian Campbell
` (11 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
The existing URL points to an unrelated patch, no doubt due to the accidental
renumbering of the archives at one point.
---
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
index 92d992b..d92afea 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ To run osstest in standalone mode:
gives you the "branch" consisting of tests run for the xen-unstable
push gate. You need to select a job. The list of available jobs
is that shown in the publicly emailed test reports on xen-devel, eg
- http://lists.xen.org/archives/html/xen-devel/2013-01/msg02574.html
+ http://lists.xen.org/archives/html/xen-devel/2013-08/msg02529.html
If you don't want to repro one of those and don't know how to
choose a job, choose one of
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 02/10] Allow hyphen in host names when parsing properties
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
2013-09-04 16:58 ` [PATCH 01/10] README: Point to current test report mail Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 03/10] standalone-reset: configure for armhf too Ian Campbell
` (10 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
The Calxeda midway nodes are e.g. marilith-n4 marilith-n5.
---
Osstest/TestSupport.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index c158b7c..8330aef 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -695,7 +695,7 @@ sub selecthost ($) {
# Finally, we override any host-specific properties from the config
foreach my $k (keys %c) {
- next unless $k =~ m/^HostProp_([a-z0-9]+)_(.*)$/;
+ next unless $k =~ m/^HostProp_([-a-z0-9]+)_(.*)$/;
next unless $1 eq $name;
$setprop->($2, $c{$k});
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 03/10] standalone-reset: configure for armhf too
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
2013-09-04 16:58 ` [PATCH 01/10] README: Point to current test report mail Ian Campbell
2013-09-04 16:58 ` [PATCH 02/10] Allow hyphen in host names when parsing properties Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 04/10] mg-debian-installer-update: support armhf Ian Campbell
` (9 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
---
standalone-reset | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/standalone-reset b/standalone-reset
index 610eeab..29c7a18 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -89,7 +89,7 @@ else
firmware=`getconfig DebianNonfreeFirmware`
if [ "x$diver" = xcurrent ]; then
- for arch in i386 amd64; do
+ for arch in i386 amd64 armhf; do
if test -d "$tftp/$dibase/$arch/$diver"
then continue; fi
mkdir -p "$tftp/$dibase/$arch"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 04/10] mg-debian-installer-update: support armhf
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (2 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 03/10] standalone-reset: configure for armhf too Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 05/10] ts-host-install: Support for different console devices Ian Campbell
` (8 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
The path to the installer differs on armhf vs amd64/i386.
Debian Wheezy does not contain kernels for the devices we want to support.
Therefore we download a kernel and modules from wheezy-backports which is new
enough.
---
mg-debian-installer-update | 63 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 61 insertions(+), 2 deletions(-)
diff --git a/mg-debian-installer-update b/mg-debian-installer-update
index 6e3d359..c0b547f 100755
--- a/mg-debian-installer-update
+++ b/mg-debian-installer-update
@@ -32,9 +32,20 @@ fail () { echo >&2 "$0: $1"; exit 1; }
site=http://ftp.debian.org/debian/
sbase=$site/dists/$suite
-src=$sbase/main/installer-$arch/current/images/netboot/debian-installer/$arch
+case $arch in
+ i386|amd64)
+ src=$sbase/main/installer-$arch/current/images/netboot/debian-installer/$arch
+ files='initrd.gz linux'
+ ;;
+ armhf)
+ # Use the vexpress image, we are going to bash in our own
+ # kernel+modules anyway.
+ src=$sbase/main/installer-$arch/current/images/vexpress/netboot
+ files='initrd.gz' # no kernel -- needs a newer kernel
+ ;;
+esac
+
pfile=$sbase/non-free/binary-$arch/Packages.bz2
-files='initrd.gz linux'
dstroot=`getconfig TftpPath`/`getconfig TftpDiBase`/
date=`date +%Y-%m-%d`-$suite
@@ -67,6 +78,54 @@ for p in $packages; do
rm -rf x
done
+# armhf requires a newer kernel than was in Wheezy for most
+# platforms. Construct something suitable from the latest kernel in
+# wheezy-backports.
+if [ $arch = armhf ]; then
+ bp="$sbase-backports"
+ pfile=$bp/main/binary-armhf/Packages.bz2
+
+ curl -s $pfile >Packages.bz2
+
+ # Newer kernel often needs a newer initramfs-tools. Make that available
+ echo >&2 "collecting backports initramfs-tools"
+ pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX initramfs-tools -nsFilename | sort -n | head -n1`
+ rc=$?
+ set -e
+ if [ $rc != 0 ]; then fail "initramfs-tools package not found"; fi
+ curl -s "$site/$pkgfile" >initramfs-tools.deb
+
+ set +e
+ echo >&2 "collecting armmp kernel"
+ # Be careful to pickup the actual kernel package from the 'linux'
+ # source and not a meta package from 'linux-latest'
+ pkgfile=`bzcat Packages.bz2 | grep-dctrl -S linux | grep-dctrl -Pe linux-image-.*-armmp -nsFilename | sort -n | head -n1`
+ rc=$?
+ set -e
+ if [ $rc != 0 ]; then fail "armmp kernel package not found"; fi
+ curl -s "$site/$pkgfile" >armmp.deb
+ dpkg-deb -x armmp.deb x
+ cp x/boot/vmlinuz-* linux.armmp
+ # The full set of modules is pretty large and not that
+ # useful. Just pull in the ones we need for our particular
+ # preseed, which is basically disk, net, filesystems and LVM.
+ cd x; find lib -type d \
+ -o -type f -name modules.\* \
+ -o -type f -name \*.ko \
+ \( -path \*/kernel/lib/\* -o \
+ -path \*/kernel/fs/mbcache.ko -o \
+ -path \*/kernel/fs/ext\* -o \
+ -path \*/kernel/fs/jbd\* -o \
+ -path \*/kernel/drivers/net/\* -o \
+ -path \*/kernel/drivers/ata/\* -o \
+ -path \*/kernel/drivers/scsi/\* -o \
+ -path \*/kernel/drivers/md/\* \) \
+ |pax -x sv4cpio -s '%lib%/lib%' -d -w >../cpio; cd ..
+ gzip -9f cpio
+ mv cpio.gz armmp.cpio.gz
+ rm -rf x
+fi
+
for f in $files; do
mv -f $f.new $f
done
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 05/10] ts-host-install: Support for different console devices
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (3 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 04/10] mg-debian-installer-update: support armhf Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 06/10] ts-host-install: Add need-kernel-deb host flag Ian Campbell
` (7 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
Subsumes NoSerial host property as well.
---
README | 5 +++--
ts-host-install | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README b/README
index d92afea..4bf3b26 100644
--- a/README
+++ b/README
@@ -88,8 +88,9 @@ HostProp_<testbox>_Ether
MAC address of the box <testbox>. Only needed if you want
to use the osstest host and Xen installer.
-HostProp_<testbox>_NoSerial
- Set to 1 if <testbox> has no serial, system will use VGA console
+HostProp_<testbox>_SerialConsole
+ Set to the serial console device on the platform. Defaults to
+ ttyS0. If set to "NONE" then the system will use VGA console
instead.
HostProp_<testbox>_DIFrontend
diff --git a/ts-host-install b/ts-host-install
index b7257d7..b974365 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -177,8 +177,10 @@ END
get_host_property($ho, "install-append $ho->{Suite}", '');
push @installcmdline, qw(--);
- push @installcmdline, "console=ttyS0,$c{Baud}n8"
- unless get_host_property($ho, "NoSerial", "0");
+
+ my $console = get_host_property($ho, "SerialConsole", "ttyS0");
+ push @installcmdline, "console=$console,$c{Baud}n8"
+ unless $console eq "NONE";
my $installcmdline= join ' ', @installcmdline;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 06/10] ts-host-install: Add need-kernel-deb host flag
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (4 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 05/10] ts-host-install: Support for different console devices Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 07/10] Debian: Honour need-kernel-deb- flag in the installed system too Ian Campbell
` (6 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
This can be used to request a specific kernel binary and initrd overlay (for
modules). These are already collected and created by
mg-debian-installer-update for the armhf "armmp" flavour.
---
ts-host-install | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/ts-host-install b/ts-host-install
index b974365..9151940 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -130,6 +130,8 @@ sub setup_pxeboot_firstboot($) {
my $src_initrd= "$d_i/initrd.gz";
my @initrds= "$c{TftpPath}/$src_initrd";
+ my $kernel;
+
foreach my $fp (keys %{ $ho->{Flags} }) {
$fp =~ s/^need-firmware-deb-// or next;
my $cpio= "$c{TftpPath}/$d_i/$fp.cpio.gz";
@@ -143,6 +145,31 @@ sub setup_pxeboot_firstboot($) {
}
}
+ foreach my $kp (keys %{ $ho->{Flags} }) {
+ $kp =~ s/need-kernel-deb-// or next;
+ my $kern= "$c{TftpPath}/$d_i/linux.$kp";
+ if (stat $kern) {
+ logm("using kernel from: $kern");
+ $kernel = "/$d_i/linux.$kp";
+ } elsif ($! == &ENOENT) {
+ logm("warning: no kernel found for $kp at $kern");
+ } else {
+ die "$kp $kern $!";
+ }
+
+ my $cpio= "$c{TftpPath}/$d_i/$kp.cpio.gz";
+ if (stat $cpio) {
+ logm("using kernel modules from: $cpio");
+ push @initrds, $cpio;
+ } elsif ($! == &ENOENT) {
+ logm("warning: no kernel module cpio found for $kp at $cpio");
+ } else {
+ die "$kp $cpio $!";
+ }
+ }
+
+ $kernel = "/$d_i/linux" unless $kernel;
+
my $initrd_overlay= "tmp/t.$ho->{Name}.initrd";
system qw(rm -rf --),"$initrd_overlay.d";
mkdir "$initrd_overlay.d" or die "$initrd_overlay.d: $!";
@@ -190,7 +217,7 @@ timeout 5
label overwrite
menu label ^Overwrite
menu default
- kernel /$d_i/linux
+ kernel $kernel
append $installcmdline
default overwrite
END
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 07/10] Debian: Honour need-kernel-deb- flag in the installed system too
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (5 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 06/10] ts-host-install: Add need-kernel-deb host flag Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 08/10] Debian: New host flag need-uboot-bootstr Ian Campbell
` (5 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
---
Osstest/Debian.pm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index e58a7cc..92d97a9 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -21,6 +21,7 @@ use strict;
use warnings;
use IO::File;
+use File::Copy;
use Osstest;
use Osstest::TestSupport;
@@ -440,6 +441,35 @@ $overlays
echo latecmd done.
END
+ foreach my $kp (keys %{ $ho->{Flags} }) {
+ $kp =~ s/need-kernel-deb-// or next;
+
+ my $d_i= $c{TftpPath}.'/'.$c{TftpDiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion};
+
+ my $kurl = create_webfile($ho, "kernel", sub {
+ copy("$d_i/$kp.deb", $_[0]);
+ });
+
+ my $iurl = create_webfile($ho, "initramfs-tools", sub {
+ copy("$d_i/initramfs-tools.deb", $_[0]);
+ });
+
+ preseed_hook_command($ho, 'late_command', $sfx, <<END);
+#!/bin/sh
+set -ex
+
+r=/target
+
+wget -O \$r/tmp/kern.deb $kurl
+wget -O \$r/tmp/initramfs-tools.deb $iurl
+
+# This will fail due to dependencies...
+in-target dpkg -i /tmp/kern.deb /tmp/initramfs-tools.deb || true
+# ... Now fix everything up...
+in-target apt-get install -f -y
+END
+ }
+
my $preseed_file= (<<END);
d-i mirror/suite string $suite
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 08/10] Debian: New host flag need-uboot-bootstr
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (6 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 07/10] Debian: Honour need-kernel-deb- flag in the installed system too Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 09/10] Debian: New host flag "no-di-kernel" Ian Campbell
` (4 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
At the moment this only generates the necessary script for a Calxeda Midway
system. It will no doubt need to be made cleverer in the future...
u-boot-tools are installed unconditionally, they are harmless unless you
explicitly invoke one of them
---
Osstest/Debian.pm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 92d97a9..91a300d 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -470,6 +470,35 @@ in-target apt-get install -f -y
END
}
+ if ( $ho->{Flags}{'need-uboot-bootscr'} ) {
+ my $vg = "$ho->{Name}-p0"; # host name is p0
+
+ $vg =~ s/-/--/g; # Escape the dashes
+ my $root="/dev/mapper/$vg-root";
+
+ preseed_hook_command($ho, 'late_command', $sfx, <<END);
+#!/bin/sh
+set -ex
+
+r=/target
+
+
+kernel=`readlink \$r/vmlinuz | sed -e 's|boot/||'`
+initrd=`readlink \$r/initrd.img | sed -e 's|boot/||'`
+
+cat >\$r/boot/boot <<EOF
+setenv bootargs console=ttyAMA0 root=$root
+mw.l 800000 0 10000
+scsi scan
+ext2load scsi 0 0x800000 \$kernel
+ext2load scsi 0 0x1000000 \$initrd
+bootz 0x800000 0x1000000:\\\${filesize} 0x1000
+EOF
+
+in-target mkimage -A arm -T script -d /boot/boot /boot/boot.scr
+END
+ }
+
my $preseed_file= (<<END);
d-i mirror/suite string $suite
@@ -551,7 +580,7 @@ console-data console-data/keymap/template/layout select British
popularity-contest popularity-contest/participate boolean false
tasksel tasksel/first multiselect standard, web-server
-d-i pkgsel/include string openssh-server
+d-i pkgsel/include string openssh-server, u-boot-tools
d-i grub-installer/only_debian boolean true
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 09/10] Debian: New host flag "no-di-kernel"
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (7 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 08/10] Debian: New host flag need-uboot-bootstr Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 16:58 ` [PATCH 10/10] make-flight: make an armhf flight Ian Campbell
` (3 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
This squashes the installers messages about not being able to find kernel
module udebs in the archive for the kernel running the installer. This will
likely be the case if the need-kernel-deb-foo flag is used (perhaps this
functionality could be keyed off this instead?)
---
Osstest/Debian.pm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 91a300d..daa89b1 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -599,6 +599,14 @@ END
(join ' && ', @{ $preseed_cmds{$di_key} }). "\n";
}
+ if ($ho->{Flags}{'no-di-kernel'}) {
+ $preseed_file .= <<END;
+d-i anna/no_kernel_modules boolean true
+d-i base-installer/kernel/skip-install boolean true
+d-i nobootloader/confirmation_common boolean true
+END
+ }
+
$preseed_file .= "$c{DebianPreseed}\n";
foreach my $name (keys %{ $xopts{Properties} }) {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 10/10] make-flight: make an armhf flight
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (8 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 09/10] Debian: New host flag "no-di-kernel" Ian Campbell
@ 2013-09-04 16:58 ` Ian Campbell
2013-09-04 17:42 ` [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (2 subsequent siblings)
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 16:58 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
---
make-flight | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/make-flight b/make-flight
index d29016d..f180ac2 100755
--- a/make-flight
+++ b/make-flight
@@ -189,11 +189,21 @@ job_create_test () {
$RUNVARS $TEST_RUNVARS $most_runvars "$@"
}
-for xenarch in ${TEST_ARCHES- i386 amd64 } ; do
+for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
if [ "x$xenarch" = xdisable ]; then continue; fi
case "$xenarch" in
+ armhf)
+ # Arm from 4.3 onwards only
+ case "$xenbranch" in
+ xen-3.*-testing) continue;;
+ xen-4.0-testing) continue;;
+ xen-4.1-testing) continue;;
+ xen-4.2-testing) continue;;
+ *) ;;
+ esac
+ ;;
i386)
# 32-bit Xen is dropped from 4.3 onwards
case "$xenbranch" in
@@ -203,6 +213,7 @@ for xenarch in ${TEST_ARCHES- i386 amd64 } ; do
xen-4.2-testing) ;;
*) continue ;;
esac
+ ;;
esac
for kern in ''; do
@@ -220,7 +231,7 @@ for xenarch in ${TEST_ARCHES- i386 amd64 } ; do
*) echo >&2 "kernkind ? $kern"; exit 1 ;;
esac
- for dom0arch in i386 amd64; do
+ for dom0arch in i386 amd64 armhf; do
eval "
arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
@@ -240,6 +251,13 @@ for xenarch in ${TEST_ARCHES- i386 amd64 } ; do
kernkind=$kernkind \
$arch_runvars
"
+ if [ $dom0arch = armhf ]; then
+ job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
+ debian_kernkind=$kernkind \
+ debian_arch=$dom0arch \
+ all_hostflags=$most_hostflags
+ continue
+ fi
job_create_test test-$xenarch$kern-$dom0arch-pv test-debian xend \
debian_kernkind=$kernkind \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (9 preceding siblings ...)
2013-09-04 16:58 ` [PATCH 10/10] make-flight: make an armhf flight Ian Campbell
@ 2013-09-04 17:42 ` Ian Campbell
2013-09-05 11:27 ` Ian Campbell
2013-09-06 15:12 ` Ian Campbell
12 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-04 17:42 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, 2013-09-04 at 17:57 +0100, Ian Campbell wrote:
> With this I can run ./standalone-reset and then:
> OSSTEST_JOB=test-armhf-armhf-xl ./ts-host-install host=marilith-n4
I've now gotten through:
OSSTEST_JOB=build-armhf ./ts-host-install host=marilith-n4
OSSTEST_JOB=build-armhf ./ts-xen-build-prep host=marilith-n4
OSSTEST_JOB=build-armhf ./ts-xen-build host=marilith-n4
apparently successfully. I think this means you could replace the
existing build test job running on the development cluster with a job
running on marilith-n5. I'd like to keep -n4 for osstest development for
now.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (10 preceding siblings ...)
2013-09-04 17:42 ` [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
@ 2013-09-05 11:27 ` Ian Campbell
2013-09-05 11:31 ` Ian Jackson
2013-09-06 15:12 ` Ian Campbell
12 siblings, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-05 11:27 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, 2013-09-04 at 17:57 +0100, Ian Campbell wrote:
>
> HostProp_marilith-n4_PowerMethod xenuse
Which needs the following patch. Here are ipmi runes too if that fits
better with the non standalone version:
ipmitool -I lanplus -U admin -P admin -H marilith-n<N>-mgmt power on
ipmitool -I lanplus -U admin -P admin -H marilith-n<N>-mgmt power off
This sytem seems to need
ipmitool -I lanplus -U admin -P admin -H marilith-n<N>-mgmt chassis bootdev pxe
which doesn't appear to be sticky, so needs to happen each time.
8<------------------------------
>From 545c44cb27bcdc27848a07b646b47d4650834da9 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 5 Sep 2013 12:24:30 +0100
Subject: [PATCH] PDU: support for xenuse controlled machines
xenuse is a Citrix internal utility for rebooting machines and accessing their
consoles etc. So this is more of a proof of concept for folks outside our
infrastructure.
---
Osstest/PDU/xenuse.pm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
create mode 100644 Osstest/PDU/xenuse.pm
diff --git a/Osstest/PDU/xenuse.pm b/Osstest/PDU/xenuse.pm
new file mode 100644
index 0000000..82a5999
--- /dev/null
+++ b/Osstest/PDU/xenuse.pm
@@ -0,0 +1,59 @@
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2013 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+package Osstest::PDU::xenuse;
+
+use strict;
+use warnings;
+
+use Osstest;
+use Osstest::TestSupport;
+use IO::File;
+
+BEGIN {
+ use Exporter ();
+ our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+ $VERSION = 1.00;
+ @ISA = qw(Exporter);
+ @EXPORT = qw();
+ %EXPORT_TAGS = ( );
+
+ @EXPORT_OK = qw();
+}
+
+our $tty;
+
+sub new {
+ my ($class, $ho) = @_;
+ logm("new xenuse PDU for $ho->{Name}");
+ return bless { Host => $ho }, $class;
+}
+
+sub pdu_power_state {
+ my ($mo, $on) = @_;
+ my $onoff= $on ? "on" : "off";
+
+ if ( $on ) {
+ #XXX this should be conditional
+ system_checked(qw(ipmitool -H), "$mo->{Host}{Name}-mgmt",qw(-U admin -P admin chassis bootdev pxe));
+ system_checked(qw(xenuse --on), "$mo->{Host}{Name}");
+ } else {
+ system_checked(qw(xenuse --off), "$mo->{Host}{Name}");
+ }
+}
+
+1;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-05 11:27 ` Ian Campbell
@ 2013-09-05 11:31 ` Ian Jackson
2013-09-05 11:36 ` Ian Campbell
0 siblings, 1 reply; 31+ messages in thread
From: Ian Jackson @ 2013-09-05 11:31 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> On Wed, 2013-09-04 at 17:57 +0100, Ian Campbell wrote:
> >
> > HostProp_marilith-n4_PowerMethod xenuse
Would you care to point me at your git branch ?
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-05 11:31 ` Ian Jackson
@ 2013-09-05 11:36 ` Ian Campbell
0 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-05 11:36 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Thu, 2013-09-05 at 12:31 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> > On Wed, 2013-09-04 at 17:57 +0100, Ian Campbell wrote:
> > >
> > > HostProp_marilith-n4_PowerMethod xenuse
>
> Would you care to point me at your git branch ?
Let me make one...
The following changes since commit 57fc56933fa288704af4344150fa3d010ed13ac6:
ap-*: use linux 3.10.y stable branch by default (2013-08-28 16:49:31 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v1
for you to fetch changes up to 545c44cb27bcdc27848a07b646b47d4650834da9:
PDU: support for xenuse controlled machines (2013-09-05 12:24:30 +0100)
----------------------------------------------------------------
Ian Campbell (11):
README: Point to current test report mail
Allow hyphen in host names when parsing properties
standalone-reset: configure for armhf too
mg-debian-installer-update: support armhf
ts-host-install: Support for different console devices
ts-host-install: Add need-kernel-deb host flag
Debian: Honour need-kernel-deb- flag in the installed system too
Debian: New host flag need-uboot-bootstr
Debian: New host flag "no-di-kernel"
make-flight: make an armhf flight
PDU: support for xenuse controlled machines
Osstest/Debian.pm | 69 +++++++++++++++++++++++++++++++++++++++++++-
Osstest/PDU/xenuse.pm | 59 +++++++++++++++++++++++++++++++++++++
Osstest/TestSupport.pm | 2 +-
README | 7 +++--
make-flight | 22 ++++++++++++--
mg-debian-installer-update | 63 ++++++++++++++++++++++++++++++++++++++--
standalone-reset | 2 +-
ts-host-install | 35 ++++++++++++++++++++--
8 files changed, 246 insertions(+), 13 deletions(-)
create mode 100644 Osstest/PDU/xenuse.pm
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
` (11 preceding siblings ...)
2013-09-05 11:27 ` Ian Campbell
@ 2013-09-06 15:12 ` Ian Campbell
2013-09-06 16:13 ` Ian Jackson
12 siblings, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-06 15:12 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, 2013-09-04 at 17:57 +0100, Ian Campbell wrote:
> With this I can run ./standalone-reset and then:
> OSSTEST_JOB=test-armhf-armhf-xl ./ts-host-install
> host=marilith-n4
I've no gotten as far as running ts-xen-install, which does some vageley
sensible looking things but Xen doesn't boot on the platform yet. It's
another tranche of 24 patches on top of this existing lot though. Rather
than spam the list (although I will if you like, or I can post
individual patch you would like to comment on upon request) I've pushed
it to a branch, which includes all the previous stuff too, pull request
at the end. This includes the runvar rework you sent me, I think there
was only one incremental fix which was "ts-xen-install: correctly
determine want_kernver and actually pass it".
I've ended up with a bunch of Wheezy related fixes in here too, all
mixed in I'm afraid...
With this I can do:
# Clone trees into mygits with git clone --mirror --bare
cat >standalong.config <<EOF
export TREE_XEN=/root/git/xen.git
export TREE_LINUX=/root/git/linux-stable.git
export REVISION_LINUX=stable/linux-3.11.y
export TREE_LINUXFIRMWARE=/root/git/linux-firmware.git
EOF
./standalone-reset
OSSTEST_JOB=build-armhf ./ts-host-install host=marilith-n4
OSSTEST_JOB=build-armhf ./ts-xen-build-prep host=marilith-n4
rsync -aH mygits/ root@marilith-n4:/root/git/
OSSTEST_JOB=build-armhf ./ts-xen-build host=marilith-n4
OSSTEST_JOB=build-armhf-pvops ./ts-kernel-build host=marilith-n4
OSSTEST_JOB=test-armhf-armhf-xl ./ts-xen-build-check host=marilith-n5
OSSTEST_JOB=test-armhf-armhf-xl ./ts-host-install host=marilith-n5
OSSTEST_JOB=test-armhf-armhf-xl ./ts-xen-install host=marilith-n5
OSSTEST_JOB=test-armhf-armhf-xl ./ts-host-reboot host=marilith-n5
Doesn't actually boot, but that's a Xen side issue I think.
8<--------------------------------------------
The following changes since commit 545c44cb27bcdc27848a07b646b47d4650834da9:
PDU: support for xenuse controlled machines (2013-09-05 12:24:30 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v2
for you to fetch changes up to d8eebf60b1bc89774271853410f76c2ecd539a09:
ts-xen-install: setup xen on arm platforms (2013-09-06 15:22:32 +0100)
----------------------------------------------------------------
Ian Campbell (18):
Debian: install ntp and ntpdate
TestSupport: Massage host props with space in them
standalone-reset: Read standalone.config on start
ts-kernel-build: adjust for armhf
ts-xen-install: wheezy has libyajl2 not 1
Debian: Abstract away bootloader configuration refresh (update-grub)
ts-xen-build: Installed binary is /boot/xen on ARM
Debian: Remove ARM naming quirk.
Merge branch 'wip.for-ijc' of xenbits.xen.org:/home/iwj/ext/osstest
ts-kernel-build: Ensure that LVM is enabled
Do not require /sbin/bootlogd to be installed.
osstest-confirm-booted: Fix for Wheezy
ts-kernel-build: Ensure CONFIG_SYSVIPC and CONFIG_BLK_DEV_LOOP are enabled
ts-xen-install: correctly determine want_kernver and actually pass it
ts-xen-build: allow per-host CONFIG_EARLY_PRINTK
Rename SerialConsole property to LinuxSerialConsole
TestSupport: Do not clobber existing symlinks when unttarring
ts-xen-install: setup xen on arm platforms
Ian Jackson (6):
ts-xen-install: pass dom0_mem=512M,max:512M (including max: spec.)
ts-kernel-build: workaround for perl-mode quirk
ts-kernel-build: store kernel_ver runvar
Debian: plumb $want_kernver through in debian_boot_setup
Debian: provide kernel version check for grub2, die for grub1
Debian: fix typo in setupboot_grub2
Osstest/Debian.pm | 137 ++++++++++++++++++++++++-----
Osstest/TestSupport.pm | 5 +-
README | 17 +++-
make-flight | 8 +-
overlay/etc/init.d/osstest-confirm-booted | 11 ++-
standalone-reset | 4 +
ts-host-install | 2 +-
ts-kernel-build | 32 ++++++-
ts-xen-build | 7 +-
ts-xen-install | 23 +++--
10 files changed, 199 insertions(+), 47 deletions(-)
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-06 15:12 ` Ian Campbell
@ 2013-09-06 16:13 ` Ian Jackson
2013-09-09 9:51 ` Ian Campbell
2013-09-09 10:01 ` Ian Campbell
0 siblings, 2 replies; 31+ messages in thread
From: Ian Jackson @ 2013-09-06 16:13 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> I've ended up with a bunch of Wheezy related fixes in here too, all
> mixed in I'm afraid...
Excellent, thanks. Here's my review notes, from irc.
Ian.
16:25 <Diziet> ijc: Thanks :-).
16:25 <Diziet> I'll read them and maybe throw them in.
16:25 <Diziet> throw them in> Depends if I get a push of my switch to 3.4.y
16:28 <ijc> Thanks. I'm not totally convinced by the parameteriztion of the
consoles and stuff, if you have any better ideas please let me know.
16:29 <Diziet> It looks OK to me.
16:29 <Diziet> You mean the ttyS0 thing
16:30 <ijc> yeah
16:30 <ijc> if you are fine with it then great ;-)
16:31 <Diziet> That uboot thing ("New host flag need-uboot-bootstr") is a bit
full of magic, but it's ARM magic so I'll just take it I think.
16:31 <Diziet> Does the d-i pkgsel/include thing work on x86 ?
16:32 <ijc> it'll eventually need teaching about different arm and uboot
platforms. I think it'll do for now though
16:32 <Diziet> Or I guess, I mean, if u-boot-tools does not exist (which maybe
it doesn't on x86 squeeze)
16:32 <ijc> I thought it did, but I may be thinking of Wheezy
16:32 <ijc> there was a second transitional/dummy package now I think about it
16:33 <Diziet> "make an armhf flight" should be called "make some armhf jobs"
but no matter.
16:33 <Diziet> ijc: Hmm. You might want to test that before I merge it and
complain.
16:33 <ijc> it was called uboot-envtools in Squeeze
16:34 <Diziet> So what happens if you mention an unknown package there ?
16:34 <ijc> I have no idea... I'll need to dig out an x86 box to test on I guess
16:34 <ijc> Or I could just make it conditiona;
16:34 <Diziet> Well, you could wait until I complain. Right.
16:35 <Diziet> "PDU: support for xenuse controlled machines" has a mysterious
ipmitool rune in it which surely doesn't belong.
16:35 <ijc> oh, oops, that's peculiar to this machine
16:35 <ijc> which seems to have a oneshot pxe thing in its firmware....
16:35 <Diziet> Right
16:35 <Diziet> I think if "xenuse --on" doesn't work that means xenuse needs to
do the weird rune.
16:36 <ijc> xenuse --on would work though, just the system will boot from hdd
not pXE
16:36 <ijc> I have a feeling this is a firmware bug -- the docs suggest the pxe
thing should be permanent...
16:36 <Diziet> "TestSupport: Massage host props with space in them" can you
turn them to _ ? Because I think we currently distinguish
"-"-aka-"StudlyCaps" from " "
16:37 <ijc> AH, I used - precisely so it would get further munged into
StudlyCps for consistency -- you don't want that?
16:38 <Diziet> Some existing property names are of the form "some-words
other-words"
16:38 <Diziet> - binds more tightly, in other words.
16:39 <ijc> ok
16:39 <Diziet> "ts-xen-install: wheezy has libyajl2 not 1" <- Does this work ?
Because qw() doesn't do $-interpolation.
16:40 <ijc> It succeeds but yajl isn't installed, I guess because the shell hid
the $yajl...
16:40 <ijc> For all these -- do you prefer I rebase or incrementally fgix?
16:41 <Diziet> You might as well incrementally fix, esp. since you seem already
to have merged.
16:42 <ijc> I can rebase -i -p if you prefer.
16:42 <Diziet> Nah.
16:42 <Diziet> Might as well have the history as you wrote it.
16:42 <Diziet> I don't think we need to stand on a nice tidy history in osstest
16:43 <Diziet> "ts-xen-build: allow per-host CONFIG_EARLY_PRINTK" definitely
wrong
16:43 <Diziet> This should be done on the kernel command line.
16:43 <Diziet> Or maybe arch-specific.
16:43 <Diziet> You mustn't make the results of the build depend on the build
host like that. Builds can get reused.
16:44 <Diziet> kernel command line> Which I think there should already be a
host property to add to. If not there should be one created.
16:46 <Diziet> "$xenkopt" and "$kopt" in the bootloader setup code
16:47 <ijc> CONFIG_EARLY_PRINTK is a compile time option I'm afraid. It's
debug=y onlkly
16:47 * Diziet gets to the end.
16:47 <Diziet> How unpleasant.
16:47 <ijc> As I said in the comment, this is only really useful for standalone
builds
16:47 <Diziet> Surely even standalone things can build here and test there ?
16:48 <ijc> only really useful for standalone builds ... if you know what you
are doing
16:48 <ijc> I don't hitnk it is technically possible to make our earlyprintk
more flexible, it is used from before we have anything like an FDT
parser avaiable, from the early asm code
16:49 <Diziet> How annoying.
16:49 <Diziet> That's before the command line is read ?
16:49 <Diziet> Can it be binary-edited into the kernel image ?
16:49 <Diziet> A la that rootdev utility or whatever it used to be called.
16:51 <ijc> no, it defines asm macros which are inlined into the head.S code.
We can just revert that patch for oSStest, it was just conveinent
for me locally
16:52 <ijc> (it's start of day code which needs to be PIC and often has no
stack)
16:52 <Diziet> I guess we can leave it in, but can you put a comment near the
call to get_host_property warning about not setting it ?
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-06 16:13 ` Ian Jackson
@ 2013-09-09 9:51 ` Ian Campbell
2013-09-10 16:54 ` Ian Jackson
2013-09-10 16:54 ` Ian Jackson
2013-09-09 10:01 ` Ian Campbell
1 sibling, 2 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-09 9:51 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Fri, 2013-09-06 at 17:13 +0100, Ian Jackson wrote:
> 16:31 <Diziet> Does the d-i pkgsel/include thing work on x86 ?
> 16:32 <ijc> it'll eventually need teaching about different arm and uboot
> platforms. I think it'll do for now though
> 16:32 <Diziet> Or I guess, I mean, if u-boot-tools does not exist (which maybe
> it doesn't on x86 squeeze)
I changed this to only add this package if the 'need-uboot-bootscr' flag
is set, which implies Wheezy or newer.
> 16:35 <Diziet> "PDU: support for xenuse controlled machines" has a mysterious
> ipmitool rune in it which surely doesn't belong.
> 16:35 <ijc> oh, oops, that's peculiar to this machine
> 16:35 <ijc> which seems to have a oneshot pxe thing in its firmware....
> 16:35 <Diziet> Right
> 16:35 <Diziet> I think if "xenuse --on" doesn't work that means xenuse needs to
> do the weird rune.
> 16:36 <ijc> xenuse --on would work though, just the system will boot from hdd
> not pXE
> 16:36 <ijc> I have a feeling this is a firmware bug -- the docs suggest the pxe
> thing should be permanent...
While I figure this out I made it conditional on a need-ipmi-pxe host
flag.
> 16:36 <Diziet> "TestSupport: Massage host props with space in them" can you
> turn them to _ ? Because I think we currently distinguish
> "-"-aka-"StudlyCaps" from " "
> 16:37 <ijc> AH, I used - precisely so it would get further munged into
> StudlyCps for consistency -- you don't want that?
> 16:38 <Diziet> Some existing property names are of the form "some-words
> other-words"
> 16:38 <Diziet> - binds more tightly, in other words.
> 16:39 <ijc> ok
Done. I also capitalised the word so "some-words other-words" ultimately
becomes "SomeWords_OtherWords" not "SomeWords_otherWords".
> 16:39 <Diziet> "ts-xen-install: wheezy has libyajl2 not 1" <- Does this work ?
> Because qw() doesn't do $-interpolation.
> 16:40 <ijc> It succeeds but yajl isn't installed, I guess because the shell hid
> the $yajl...
Fixed.
> 16:43 <Diziet> "ts-xen-build: allow per-host CONFIG_EARLY_PRINTK" definitely
> wrong
[...]
> 16:52 <Diziet> I guess we can leave it in, but can you put a comment near the
> call to get_host_property warning about not setting it ?
Done. I have also left it deliberately unmentioned in README too.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-06 16:13 ` Ian Jackson
2013-09-09 9:51 ` Ian Campbell
@ 2013-09-09 10:01 ` Ian Campbell
2013-09-09 10:34 ` Ian Campbell
1 sibling, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-09 10:01 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Fri, 2013-09-06 at 17:13 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> > I've ended up with a bunch of Wheezy related fixes in here too, all
> > mixed in I'm afraid...
>
> Excellent, thanks. Here's my review notes, from irc.
Fixes pushed to -v3. Incremental pull-request:
The following changes since commit d8eebf60b1bc89774271853410f76c2ecd539a09:
ts-xen-install: setup xen on arm platforms (2013-09-06 15:22:32 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v3
for you to fetch changes up to 29b6d6525e20d060f80972bf99eeaa367b27bb9c:
ts-xen-build: Warn strongly against using early printk (2013-09-09 10:55:49 +0100)
----------------------------------------------------------------
Ian Campbell (7):
Debian.pm: Unconfuse emacs perl-mode
Debian.pm: Restrict installation on u-boot-tools
Massage spaces in host proprties into underscores.
README: Document Build_Make_Flags
PDU::xenuse: Make use of ipmpi 'chassis bootdev pxe' conditional on a flag
ts-xen-install: fix installation of libyajl[12]
ts-xen-build: Warn strongly against using early printk
Osstest/Debian.pm | 10 +++++++---
Osstest/PDU/xenuse.pm | 2 +-
Osstest/TestSupport.pm | 17 +++++++++++++----
README | 3 +++
ts-xen-build | 6 ++++++
ts-xen-install | 5 +++--
6 files changed, 33 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-09 10:01 ` Ian Campbell
@ 2013-09-09 10:34 ` Ian Campbell
0 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-09 10:34 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Mon, 2013-09-09 at 11:01 +0100, Ian Campbell wrote:
> On Fri, 2013-09-06 at 17:13 +0100, Ian Jackson wrote:
> > Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> > > I've ended up with a bunch of Wheezy related fixes in here too, all
> > > mixed in I'm afraid...
> >
> > Excellent, thanks. Here's my review notes, from irc.
>
> Fixes pushed to -v3. Incremental pull-request:
Contained a stupid thinko. I pushed one more patch.
The following changes since commit d8eebf60b1bc89774271853410f76c2ecd539a09:
ts-xen-install: setup xen on arm platforms (2013-09-06 15:22:32 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v3
for you to fetch changes up to 2706847c9d40ebd31ef7e7ae1693cf7351817ea5:
Debian.pm: Fix thinko (2013-09-09 11:18:46 +0100)
----------------------------------------------------------------
Ian Campbell (8):
Debian.pm: Unconfuse emacs perl-mode
Debian.pm: Restrict installation on u-boot-tools
Massage spaces in host proprties into underscores.
README: Document Build_Make_Flags
PDU::xenuse: Make use of ipmpi 'chassis bootdev pxe' conditional on a flag
ts-xen-install: fix installation of libyajl[12]
ts-xen-build: Warn strongly against using early printk
Debian.pm: Fix thinko
Osstest/Debian.pm | 10 +++++++---
Osstest/PDU/xenuse.pm | 2 +-
Osstest/TestSupport.pm | 17 +++++++++++++----
README | 3 +++
ts-xen-build | 6 ++++++
ts-xen-install | 5 +++--
6 files changed, 33 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-09 9:51 ` Ian Campbell
@ 2013-09-10 16:54 ` Ian Jackson
2013-09-11 9:24 ` Ian Campbell
2013-09-10 16:54 ` Ian Jackson
1 sibling, 1 reply; 31+ messages in thread
From: Ian Jackson @ 2013-09-10 16:54 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add
initial support for testing arm32 on arm servers (Calxeda Midway)"):
> [stuff]
Thanks. This all looks promising. However I did a make-flight and it
generated a test job "test-amd64-armhf-xl" which isn't going to work
very well :-).
Aside from that I think it's ready to merge in.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-09 9:51 ` Ian Campbell
2013-09-10 16:54 ` Ian Jackson
@ 2013-09-10 16:54 ` Ian Jackson
1 sibling, 0 replies; 31+ messages in thread
From: Ian Jackson @ 2013-09-10 16:54 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> On Fri, 2013-09-06 at 17:13 +0100, Ian Jackson wrote:
...
> > 16:35 <Diziet> "PDU: support for xenuse controlled machines" has a mysterious
> > ipmitool rune in it which surely doesn't belong.
> > 16:35 <ijc> oh, oops, that's peculiar to this machine
> > 16:35 <ijc> which seems to have a oneshot pxe thing in its firmware....
> > 16:35 <Diziet> Right
> > 16:35 <Diziet> I think if "xenuse --on" doesn't work that means xenuse needs to
> > do the weird rune.
> > 16:36 <ijc> xenuse --on would work though, just the system will boot from hdd
> > not pXE
> > 16:36 <ijc> I have a feeling this is a firmware bug -- the docs suggest the pxe
> > thing should be permanent...
>
> While I figure this out I made it conditional on a need-ipmi-pxe host
> flag.
This is pretty ugly of course. It will do for now. For future
reference, if we want hacks like this they should be in the PDU
arguments, rather than a host flag.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-10 16:54 ` Ian Jackson
@ 2013-09-11 9:24 ` Ian Campbell
2013-09-11 16:17 ` Ian Jackson
0 siblings, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-11 9:24 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Tue, 2013-09-10 at 17:54 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add
> initial support for testing arm32 on arm servers (Calxeda Midway)"):
> > [stuff]
>
> Thanks. This all looks promising. However I did a make-flight and it
> generated a test job "test-amd64-armhf-xl" which isn't going to work
> very well :-).
>
> Aside from that I think it's ready to merge in.
Fixed this and refactored the IPMI magic as we discussed IRL. Changes
since v3:
The following changes since commit 2706847c9d40ebd31ef7e7ae1693cf7351817ea5:
Debian.pm: Fix thinko (2013-09-09 11:18:46 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v4
for you to fetch changes up to 46eec5452fb0485a562509c79b93717df391f3eb:
PDU: Refactor magic IPMI commands from xenuse module (2013-09-11 10:22:46 +0100)
----------------------------------------------------------------
Ian Campbell (2):
make-flight: Be more explicit about xen/dom0 combinations to test
PDU: Refactor magic IPMI commands from xenuse module
Osstest/PDU/ipmiextra.pm | 58 ++++++++++++++++++++++++++++++++++++++++++++++
Osstest/PDU/xenuse.pm | 13 ++---------
make-flight | 10 ++++++--
3 files changed, 68 insertions(+), 13 deletions(-)
create mode 100644 Osstest/PDU/ipmiextra.pm
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-11 9:24 ` Ian Campbell
@ 2013-09-11 16:17 ` Ian Jackson
2013-09-12 8:46 ` Ian Campbell
0 siblings, 1 reply; 31+ messages in thread
From: Ian Jackson @ 2013-09-11 16:17 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
> Fixed this and refactored the IPMI magic as we discussed IRL. Changes
> since v3:
>
> The following changes since commit 2706847c9d40ebd31ef7e7ae1693cf7351817ea5:
>
> Debian.pm: Fix thinko (2013-09-09 11:18:46 +0100)
>
> are available in the git repository at:
>
> git://xenbits.xen.org/people/ianc/osstest.git calxeda-midway-v4
>
> for you to fetch changes up to 46eec5452fb0485a562509c79b93717df391f3eb:
>
> PDU: Refactor magic IPMI commands from xenuse module (2013-09-11 10:22:46 +0100)
Looks good. I have merged it and pushed the result to the pretest
branch (push gate input). More news tomorrow...
Thanks,
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-11 16:17 ` Ian Jackson
@ 2013-09-12 8:46 ` Ian Campbell
2013-09-12 11:00 ` Ian Jackson
0 siblings, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-12 8:46 UTC (permalink / raw)
To: Ian Jackson; +Cc: Stefano Stabellini, xen-devel
On Wed, 2013-09-11 at 17:17 +0100, Ian Jackson wrote:
> Looks good. I have merged it and pushed the result to the pretest
> branch (push gate input). More news tomorrow...
\!/
Did I remember to mention that this will need a newer kernel than is
currently the default? I bet I forgot.
I used v3.11 locally when testing but we'll soon need some fixes on top
of that. Anything older probably won't do the job.
Probably we need to maintain a specific branch to test against --
Stefano do you think you could set that up and maintain it?
I presume this will need some frobbing in make-flight to become true.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 8:46 ` Ian Campbell
@ 2013-09-12 11:00 ` Ian Jackson
2013-09-12 11:19 ` Ian Campbell
2013-09-12 11:28 ` Ian Campbell
0 siblings, 2 replies; 31+ messages in thread
From: Ian Jackson @ 2013-09-12 11:00 UTC (permalink / raw)
To: Ian Campbell; +Cc: Stefano Stabellini, xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> On Wed, 2013-09-11 at 17:17 +0100, Ian Jackson wrote:
> > Looks good. I have merged it and pushed the result to the pretest
> > branch (push gate input). More news tomorrow...
>
> \!/
See my bounce of the test report. It passed the push gate as expected
:-) but of course the actual test failed.
> Did I remember to mention that this will need a newer kernel than is
> currently the default? I bet I forgot.
Yes.
> I used v3.11 locally when testing but we'll soon need some fixes on top
> of that. Anything older probably won't do the job.
>
> Probably we need to maintain a specific branch to test against --
> Stefano do you think you could set that up and maintain it?
I guess we want a push gate for this too ? What should the branch be
called, linux-3.11-arm-xen (with push gate output
tested/3.11-arm-xen) ?
> I presume this will need some frobbing in make-flight to become true.
Yes. It's probably easier if I do that part.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 11:00 ` Ian Jackson
@ 2013-09-12 11:19 ` Ian Campbell
2013-09-12 14:22 ` Ian Jackson
2013-09-12 11:28 ` Ian Campbell
1 sibling, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-12 11:19 UTC (permalink / raw)
To: Ian Jackson; +Cc: Stefano Stabellini, xen-devel
On Thu, 2013-09-12 at 12:00 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> > On Wed, 2013-09-11 at 17:17 +0100, Ian Jackson wrote:
> > > Looks good. I have merged it and pushed the result to the pretest
> > > branch (push gate input). More news tomorrow...
> >
> > \!/
>
> See my bounce of the test report. It passed the push gate as expected
> :-) but of course the actual test failed.
The test was using army, the following would fix it I think but do you
need help on configuring some of the Calxeda nodes?
Ian.
8<----------------------
>From a1b9fc50d71c09739e4b44ef3ccba1b54a75d094 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 12 Sep 2013 12:15:49 +0100
Subject: [PATCH] ts-kernel-build: Honour the homedir property
Untested but following ts-xen-build.
---
ts-kernel-build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ts-kernel-build b/ts-kernel-build
index c1d6b1c..5630dd7 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -27,7 +27,8 @@ $whhost ||= 'host';
our $ho= selecthost($whhost);
my $leaf= "build.$flight.$job";
-my $builddir= "/home/osstest/$leaf";
+my $homedir = get_host_property($ho, 'homedir', '/home/osstest');
+my $builddir= "$homedir/$leaf";
my $makeflags= get_host_property($ho, 'build make flags', '-j4');
--
1.7.10.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 11:00 ` Ian Jackson
2013-09-12 11:19 ` Ian Campbell
@ 2013-09-12 11:28 ` Ian Campbell
2013-09-12 14:46 ` Ian Jackson
1 sibling, 1 reply; 31+ messages in thread
From: Ian Campbell @ 2013-09-12 11:28 UTC (permalink / raw)
To: Ian Jackson; +Cc: Stefano Stabellini, xen-devel
On Thu, 2013-09-12 at 12:00 +0100, Ian Jackson wrote:
> > I used v3.11 locally when testing but we'll soon need some fixes on top
> > of that. Anything older probably won't do the job.
> >
> > Probably we need to maintain a specific branch to test against --
> > Stefano do you think you could set that up and maintain it?
>
> I guess we want a push gate for this too ? What should the branch be
> called, linux-3.11-arm-xen (with push gate output
> tested/3.11-arm-xen) ?
I think we are likely to want to ratchet through the 3.12 and 3.13
reasonably quickly in the short term.
How about we track mainline releases but not stable releases and instead
cherrypick fixes we need and merge new uptream versions when we want to
climb up? That would keep the tree non-rebasing. In that case I'd call
it linux-arm-xen in the hopes that one day it can be replaced by a linux
stable branch.
Stefano, do you think that would work?
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 11:19 ` Ian Campbell
@ 2013-09-12 14:22 ` Ian Jackson
2013-09-12 14:27 ` Ian Campbell
0 siblings, 1 reply; 31+ messages in thread
From: Ian Jackson @ 2013-09-12 14:22 UTC (permalink / raw)
To: Ian Campbell; +Cc: Stefano Stabellini, xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support> The test was using army, the following would fix it I think but do you
> need help on configuring some of the Calxeda nodes?
Right. If you send me the config info for marilith I'll add it to the
db and we can see what comes out...
> From: Ian Campbell <ian.campbell@citrix.com>
> Date: Thu, 12 Sep 2013 12:15:49 +0100
> Subject: [PATCH] ts-kernel-build: Honour the homedir property
>
> Untested but following ts-xen-build.
Applied, thanks. (To osstest staging.)
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 14:22 ` Ian Jackson
@ 2013-09-12 14:27 ` Ian Campbell
0 siblings, 0 replies; 31+ messages in thread
From: Ian Campbell @ 2013-09-12 14:27 UTC (permalink / raw)
To: Ian Jackson; +Cc: Stefano Stabellini, xen-devel
On Thu, 2013-09-12 at 15:22 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support> The test was using army, the following would fix it I think but do you
> > need help on configuring some of the Calxeda nodes?
>
> Right. If you send me the config info for marilith I'll add it to the
> db and we can see what comes out...
>
I've been using:
HostProp_marilith-n5_Suite wheezy
HostProp_marilith-n5_PowerMethod ipmiextra on admin admin chassis bootdev pxe;xenuse
HostProp_marilith-n5_LinuxSerialConsole ttyAMA0
HostProp_marilith-n5_XenSerialConsole dtuart
HostProp_marilith-n5_XenDTUARTPath /soc/serial@fff36000
HostFlags_marilith-n5 need-kernel-deb-armmp,no-di-kernel,need-uboot-bootscr #,need-ipmi-pxe
HostProp_marilith-n5_Build_Make_Flags -j12
HostProp_marilith-n5_EarlyPrintk midway
marilith-n5 is available for osstest and is locked in xenuse for that
purpose. (osstest doesn't have a NIS user, so it is in my name)
I've been using it as a test host, but I can stick to -n4 for now. Once
I've ironed out the kinks osstest can have that one too.
I presume there is no problem, either in real or standalone mode, with
sharing the same host for build and test runnign?
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)
2013-09-12 11:28 ` Ian Campbell
@ 2013-09-12 14:46 ` Ian Jackson
0 siblings, 0 replies; 31+ messages in thread
From: Ian Jackson @ 2013-09-12 14:46 UTC (permalink / raw)
To: Ian Campbell; +Cc: Stefano Stabellini, xen-devel
Ian Campbell writes ("Re: [Xen-devel] [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway)"):
> How about we track mainline releases but not stable releases and instead
> cherrypick fixes we need and merge new uptream versions when we want to
> climb up? That would keep the tree non-rebasing. In that case I'd call
> it linux-arm-xen in the hopes that one day it can be replaced by a linux
> stable branch.
That seems plausible.
> Stefano, do you think that would work?
Just let me know where the input branch is, and I'll set it up.
Ian.
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2013-09-12 14:46 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-04 16:57 [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
2013-09-04 16:58 ` [PATCH 01/10] README: Point to current test report mail Ian Campbell
2013-09-04 16:58 ` [PATCH 02/10] Allow hyphen in host names when parsing properties Ian Campbell
2013-09-04 16:58 ` [PATCH 03/10] standalone-reset: configure for armhf too Ian Campbell
2013-09-04 16:58 ` [PATCH 04/10] mg-debian-installer-update: support armhf Ian Campbell
2013-09-04 16:58 ` [PATCH 05/10] ts-host-install: Support for different console devices Ian Campbell
2013-09-04 16:58 ` [PATCH 06/10] ts-host-install: Add need-kernel-deb host flag Ian Campbell
2013-09-04 16:58 ` [PATCH 07/10] Debian: Honour need-kernel-deb- flag in the installed system too Ian Campbell
2013-09-04 16:58 ` [PATCH 08/10] Debian: New host flag need-uboot-bootstr Ian Campbell
2013-09-04 16:58 ` [PATCH 09/10] Debian: New host flag "no-di-kernel" Ian Campbell
2013-09-04 16:58 ` [PATCH 10/10] make-flight: make an armhf flight Ian Campbell
2013-09-04 17:42 ` [PATCH osstest 00/10] Add initial support for testing arm32 on arm servers (Calxeda Midway) Ian Campbell
2013-09-05 11:27 ` Ian Campbell
2013-09-05 11:31 ` Ian Jackson
2013-09-05 11:36 ` Ian Campbell
2013-09-06 15:12 ` Ian Campbell
2013-09-06 16:13 ` Ian Jackson
2013-09-09 9:51 ` Ian Campbell
2013-09-10 16:54 ` Ian Jackson
2013-09-11 9:24 ` Ian Campbell
2013-09-11 16:17 ` Ian Jackson
2013-09-12 8:46 ` Ian Campbell
2013-09-12 11:00 ` Ian Jackson
2013-09-12 11:19 ` Ian Campbell
2013-09-12 14:22 ` Ian Jackson
2013-09-12 14:27 ` Ian Campbell
2013-09-12 11:28 ` Ian Campbell
2013-09-12 14:46 ` Ian Jackson
2013-09-10 16:54 ` Ian Jackson
2013-09-09 10:01 ` Ian Campbell
2013-09-09 10:34 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).