* [PATCH OSSTEST v3 1/6] Add a flight to test qemu.org's ("mainline") master branch.
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:16 ` Ian Jackson
2014-05-15 10:30 ` [PATCH OSSTEST v3 2/6] Add a flight to test seabios.org's " Ian Campbell
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
The naming here is slightly confused because we call our branches of qemuu on
xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.
I've introduced $qemuubranch along the lines of $xenbranch, it is normally set
to qemu-upstream-{X.Y,unstable} but for the qemu-mainline flight it instead
points to qemu-mainline.
I've run up to the make-flight bit of cr-daily-branch and it differs only in
the expected ways from a standard xen-unstable branch (i.e. uses xen.git#master
and qemu.git#master).
I did consider causing make-flight:job_create_test_filter_callback to omit any
test which didn't use qemuu but I decided not to because it is used for PV
qdisk backends too.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v3: - Output tree is now osstest/qemu.git#mainline/xen-tested-master
- ap-push to refs/heads/...
- adjust crm-daily-branch to pick the correct TREE_QEMU_UPSTREAM when
testing mainline.
v2: - Finalised repo names on xenbits as /osstest/qemu-mainline.git (and
removed associated changelog comment about not being sure)
- Removed wanderings about qemu-upstream filtering from commit log too.
---
ap-common | 5 +++++
ap-fetch-version | 4 ++++
ap-fetch-version-old | 4 ++++
ap-print-url | 3 +++
ap-push | 5 +++++
cr-daily-branch | 9 ++++++---
cr-for-branches | 2 +-
cri-common | 4 ++++
8 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ap-common b/ap-common
index ed37811..b475156 100644
--- a/ap-common
+++ b/ap-common
@@ -70,6 +70,11 @@ fi
: ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/staging/qemu-upstream-${xenbranch#xen-}.git}
: ${LOCALREV_QEMU_UPSTREAM:=daily-cron.$branch}
+: ${TREE_QEMU_MAINLINE:=git://git.qemu.org/qemu.git}
+: ${BASE_TREE_QEMU_MAINLINE:=git://xenbits.xen.org/osstest/qemu.git}
+: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu.git}
+: ${LOCALREV_QEMU_MAINLINE:=daily-cron.$branch}
+
info_linux_tree () {
case $1 in
diff --git a/ap-fetch-version b/ap-fetch-version
index 7cc2d98..a4558ea 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -49,6 +49,10 @@ xen-4.*-testing)
repo_tree_rev_fetch_git xen \
$TREE_XEN staging-$branchcore $LOCALREV_XEN
;;
+qemu-mainline)
+ repo_tree_rev_fetch_git $branch \
+ $TREE_QEMU_MAINLINE master $LOCALREV_QEMU_UPSTREAM
+ ;;
qemu-upstream-*)
repo_tree_rev_fetch_git $branch \
$TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 3879e09..41e3a58 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -54,6 +54,10 @@ xen-4.*-testing)
repo_tree_rev_fetch_git xen \
$TREE_XEN stable-$branchcore $LOCALREV_XEN
;;
+qemu-mainline)
+ repo_tree_rev_fetch_git $branch \
+ $BASE_TREE_QEMU_MAINLINE mainline/xen-tested-master $LOCALREV_QEMU_MAINLINE
+ ;;
qemu-upstream-*)
repo_tree_rev_fetch_git $branch \
$BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM
diff --git a/ap-print-url b/ap-print-url
index b1af0b9..a21efce 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -34,6 +34,9 @@ case "$branch" in
xen*)
echo $TREE_XEN
;;
+qemu-mainline)
+ echo $TREE_QEMU_MAINLINE
+ ;;
qemu-upstream-*)
echo $TREE_QEMU_UPSTREAM
;;
diff --git a/ap-push b/ap-push
index 674559f..a9871f7 100755
--- a/ap-push
+++ b/ap-push
@@ -30,6 +30,7 @@ select_xenbranch
. ap-common
TREE_LINUX=$PUSH_TREE_LINUX
+TREE_QEMU_MAINLINE=$PUSH_TREE_QEMU_MAINLINE
TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
TREE_XEN=$PUSH_TREE_XEN
TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
@@ -57,6 +58,10 @@ xen-*-testing)
xenversion=${xenversion#xen-}
git push $TREE_XEN $revision:stable-$xenversion
;;
+qemu-mainline)
+ cd $repos/qemu-mainline
+ git push $TREE_QEMU_MAINLINE $revision:refs/heads/mainline/xen-tested-master
+ ;;
qemu-upstream-*)
cd $repos/$branch
git push $TREE_QEMU_UPSTREAM $revision:master
diff --git a/cr-daily-branch b/cr-daily-branch
index 0cafe39..6231256 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -111,8 +111,11 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then
xen-3.*|xen-4.[01]-*)
;;
*)
- REVISION_QEMU_UPSTREAM="`fetch_version \
- qemu-upstream-${xenbranch#xen-}`"
+ if [ "x$qemuubranch" = "xqemu-mainline" ] ; then
+ TREE_QEMU_UPSTREAM=$TREE_QEMU_MAINLINE
+ export TREE_QEMU_UPSTREAM
+ fi
+ REVISION_QEMU_UPSTREAM="`fetch_version $qemuubranch`"
;;
esac
export REVISION_QEMU_UPSTREAM
@@ -166,7 +169,7 @@ osstest)
fi
;;
qemuu)
- realtree=qemu-upstream-${xenbranch#xen-}
+ realtree=$qemuubranch
NEW_REVISION=$REVISION_QEMU_UPSTREAM
;;
linuxfirmware)
diff --git a/cr-for-branches b/cr-for-branches
index 60611d1..bded06f 100755
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -31,7 +31,7 @@ scriptoptions="$1"; shift
LOGFILE=tmp/cr-for-branches.log
export LOGFILE
-: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index d82312c..d901383 100644
--- a/cri-common
+++ b/cri-common
@@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
select_xenbranch () {
case "$branch" in
xen*) tree=xen; xenbranch=$branch ;;
+ qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;;
qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};;
linux) tree=linux; xenbranch=xen-unstable ;;
linux-*) tree=linux; xenbranch=xen-unstable ;;
@@ -55,6 +56,9 @@ select_xenbranch () {
else
linuxbranch=''
fi
+ if [ x$qemuubranch = x ]; then
+ qemuubranch="qemu-upstream-${xenbranch#xen-}"
+ fi
}
select_branch () {
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH OSSTEST v3 2/6] Add a flight to test seabios.org's master branch
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
2014-05-15 10:30 ` [PATCH OSSTEST v3 1/6] Add a flight to test qemu.org's ("mainline") master branch Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:17 ` Ian Jackson
2014-05-15 10:30 ` [PATCH OSSTEST v3 3/6] ts-xen-build: stash the Xen and SeaBIOS .config's Ian Campbell
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
Most of this is the usual stuff for adding a new branch.
cr-daily-branch needed to set REVISION_SEABIOS for the seabios branch and leave
it blank for others (so that Config.mk's version will be used). ts-xen-build
already consumes the resulting version runvar but needed to be taught about the
tree URL runvar.
make-flight and mfi-common are updated to only build+test seabios on x86.
The new branch is added to cr-daily-branches.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v3: - ap-push to refs/heads/...
v2: - finaled repo names on xenbits as /osstest/seabios.git
- stop trying to filter non-qemuu flights, there aren't many and getting
the right ones is tricky.
---
ap-common | 5 +++++
ap-fetch-version | 4 ++++
ap-fetch-version-old | 5 +++++
ap-print-url | 3 +++
ap-push | 5 +++++
cr-daily-branch | 12 ++++++++++++
cr-for-branches | 2 +-
cri-common | 1 +
make-flight | 6 ++++++
mfi-common | 5 ++++-
ts-xen-build | 3 +++
11 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/ap-common b/ap-common
index b475156..36adf68 100644
--- a/ap-common
+++ b/ap-common
@@ -39,6 +39,10 @@
: ${TREE_GNULIB_LIBVIRT:=git://git.sv.gnu.org/gnulib.git}
+: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git}
+: ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
+: ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git}
+
: ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
: ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
: ${UPSTREAM_TREE_LINUXFIRMWARE:=$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git}
@@ -64,6 +68,7 @@ fi
: ${LOCALREV_LINUX:=daily-cron.$branch}
: ${LOCALREV_LIBVIRT:=daily-cron.$branch}
: ${LOCALREV_GNULIB_LIBVIRT:=daily-cron.$branch}
+: ${LOCALREV_SEABIOS:=daily-cron.$branch}
: ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}
diff --git a/ap-fetch-version b/ap-fetch-version
index a4558ea..9f65fca 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -81,6 +81,10 @@ gnulib-libvirt)
repo_tree_rev_fetch_git gnulib-libvirt \
$TREE_GNULIB_LIBVIRT master $LOCALREV_GNULIB_LIBVIRT
;;
+seabios)
+ repo_tree_rev_fetch_git seabios \
+ $TREE_SEABIOS master $LOCALREV_SEABIOS
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch $HOME/testing.git pretest:ap-fetch >&2
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 41e3a58..968d4e3 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -28,6 +28,7 @@ select_xenbranch
: ${BASE_TAG_LINUX2639:=tested/2.6.39.x}
: ${BASE_LOCALREV_LINUX:=daily-cron.$branch.old}
: ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old}
+: ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old}
: ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}}
@@ -86,6 +87,10 @@ gnulib-libvirt)
# No push gate, same as ap-fetch-version
./ap-fetch-version $branch
;;
+seabios)
+ repo_tree_rev_fetch_git seabios \
+ $BASE_TREE_SEABIOS xen-tested-master $BASE_LOCALREV_SEABIOS
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch -f $HOME/testing.git incoming:ap-fetch
diff --git a/ap-print-url b/ap-print-url
index a21efce..637c9cc 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -55,6 +55,9 @@ libvirt)
gnulib-libvirt)
echo $TREE_GNULIB_LIBVIRT
;;
+seabios)
+ echo $TREE_SEABIOS
+ ;;
osstest)
echo none:;
;;
diff --git a/ap-push b/ap-push
index a9871f7..75be56c 100755
--- a/ap-push
+++ b/ap-push
@@ -34,6 +34,7 @@ TREE_QEMU_MAINLINE=$PUSH_TREE_QEMU_MAINLINE
TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
TREE_XEN=$PUSH_TREE_XEN
TREE_LIBVIRT=$PUSH_TREE_LIBVIRT
+TREE_SEABIOS=$PUSH_TREE_SEABIOS
if info_linux_tree "$branch"; then
cd $repos/linux
@@ -87,6 +88,10 @@ gnulib-libvirt)
echo "gnulib-libvirt has not push gate, refusing to push" >&2
exit 1
;;
+seabios)
+ cd $repos/seabios
+ git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master
+ ;;
osstest)
git push $HOME/testing.git $revision:incoming
git push $XENBITS:/home/xen/git/osstest.git $revision:master
diff --git a/cr-daily-branch b/cr-daily-branch
index 6231256..2cd6470 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -136,6 +136,14 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then
export REVISION_LINUX_ARM
fi
fi
+if [ "x$REVISION_SEABIOS" = x ]; then
+ if [ "x$tree" = "xseabios" ]; then
+ determine_version REVISION_SEABIOS seabios
+ export REVISION_SEABIOS
+ else
+ : REVISION_SEABIOS from Config.mk
+ fi
+fi
if [ "x$REVISION_LIBVIRT" = x ]; then
determine_version REVISION_LIBVIRT libvirt
export REVISION_LIBVIRT
@@ -180,6 +188,10 @@ libvirt)
realtree=libvirt
NEW_REVISION=$REVISION_LIBVIRT
;;
+seabios)
+ realtree=seabios
+ NEW_REVISION=$REVISION_SEABIOS
+ ;;
*)
NEW_REVISION=''
wantpush=false
diff --git a/cr-for-branches b/cr-for-branches
index bded06f..5ed0a17 100755
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -31,7 +31,7 @@ scriptoptions="$1"; shift
LOGFILE=tmp/cr-for-branches.log
export LOGFILE
-: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen seabios ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index d901383..b180c4f 100644
--- a/cri-common
+++ b/cri-common
@@ -49,6 +49,7 @@ select_xenbranch () {
linux-*) tree=linux; xenbranch=xen-unstable ;;
linuxfirmware) tree=linuxfirmware; xenbranch=xen-unstable ;;
libvirt) tree=libvirt; xenbranch=xen-unstable ;;
+ seabios) tree=seabios; xenbranch=xen-unstable ;;
osstest) tree=osstest; xenbranch=xen-unstable ;;
esac
if [ "x$tree" = xlinux ]; then
diff --git a/make-flight b/make-flight
index dff82b0..06e4d28 100755
--- a/make-flight
+++ b/make-flight
@@ -67,6 +67,12 @@ job_create_test_filter_callback () {
libvirt)
if [ x$toolstack != xlibvirt ] ; then return 1; fi
;;
+ seabios)
+ case $xenarch in
+ amd64|i386) ;;
+ *) return 1;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
diff --git a/mfi-common b/mfi-common
index 464001a..8845431 100644
--- a/mfi-common
+++ b/mfi-common
@@ -52,6 +52,7 @@ create_build_jobs () {
linux-mingo-tip-master) continue;;
linux-*) ;;
qemu-*) continue;;
+ seabios) continue;;
esac
case "$xenbranch" in
xen-3.*-testing) continue;;
@@ -131,12 +132,14 @@ create_build_jobs () {
tree_qemu=$TREE_QEMU \
tree_qemuu=$TREE_QEMU_UPSTREAM \
tree_xen=$TREE_XEN \
+ tree_seabios=$TREE_SEABIOS \
$RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
$suite_runvars \
host_hostflags=$build_hostflags \
revision_xen=$REVISION_XEN \
revision_qemu=$REVISION_QEMU \
- revision_qemuu=$REVISION_QEMU_UPSTREAM
+ revision_qemuu=$REVISION_QEMU_UPSTREAM \
+ revision_seabios=$REVISION_SEABIOS
if [ $build_extraxend = "true" ] ; then
./cs-job-create $flight build-$arch-xend build \
diff --git a/ts-xen-build b/ts-xen-build
index 7ac46ea..5a764fd 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -67,6 +67,9 @@ END
(nonempty($r{revision_qemuu}) ? <<END : '').
echo >>.config QEMU_UPSTREAM_REVISION='$r{revision_qemuu}'
END
+ (nonempty($r{tree_seabios}) ? <<END : '').
+ echo >>.config SEABIOS_UPSTREAM_URL='$r{tree_seabios}'
+END
(nonempty($r{revision_seabios}) ? <<END : '').
echo >>.config SEABIOS_UPSTREAM_TAG='$r{revision_seabios}'
END
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH OSSTEST v3 3/6] ts-xen-build: stash the Xen and SeaBIOS .config's
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
2014-05-15 10:30 ` [PATCH OSSTEST v3 1/6] Add a flight to test qemu.org's ("mainline") master branch Ian Campbell
2014-05-15 10:30 ` [PATCH OSSTEST v3 2/6] Add a flight to test seabios.org's " Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:17 ` Ian Jackson
2014-05-15 10:30 ` [PATCH OSSTEST v3 4/6] ts-xen-build: Move Xen build tree from xen-unstable to just xen Ian Campbell
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
ts-xen-build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ts-xen-build b/ts-xen-build
index 5a764fd..1d5d2bf 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -151,6 +151,9 @@ sub stash () {
"${part}dist");
}
built_stash_file($ho, $builddir, "xen-syms", "xen-unstable/xen/xen-syms", 1);
+ built_stash_file($ho, $builddir, "xen-config", "xen-unstable/.config", 1);
+ built_stash_file($ho, $builddir, "seabios-config",
+ "xen-unstable/tools/firmware/seabios-dir-remote/.config", 1);
built_compress_stashed("xen-syms");
}
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH OSSTEST v3 4/6] ts-xen-build: Move Xen build tree from xen-unstable to just xen
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
` (2 preceding siblings ...)
2014-05-15 10:30 ` [PATCH OSSTEST v3 3/6] ts-xen-build: stash the Xen and SeaBIOS .config's Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:17 ` Ian Jackson
2014-05-15 10:30 ` [PATCH OSSTEST v3 5/6] standalone: allow making a baseline flight Ian Campbell
2014-05-15 10:30 ` [PATCH OSSTEST v3 6/6] sg-run-job: check for prerequisite builds when running build jobs Ian Campbell
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
It's not always xen-unstable we are testing, and I had to check that it was
the right generic name, so reduce this confusion.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
ts-xen-build | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ts-xen-build b/ts-xen-build
index 1d5d2bf..78ba806 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -37,7 +37,7 @@ my $makeflags= get_host_property($ho, 'build make flags', '-j4');
sub checkout () {
target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 60);
- build_clone($ho, 'xen', $builddir, 'xen-unstable');
+ build_clone($ho, 'xen', $builddir, 'xen');
my $debug_build = $r{xen_build_debug} || 'y';
@@ -50,7 +50,7 @@ sub checkout () {
my $earlyprintk = get_host_property($ho, 'EarlyPrintk', undef);
target_cmd_build($ho, 100, $builddir, <<END.
- cd $builddir/xen-unstable
+ cd $builddir/xen
>.config
echo >>.config debug=$debug_build
echo >>.config GIT_HTTP=y
@@ -85,7 +85,7 @@ END
sub buildcmd_stamped_logged ($$$$$) {
my ($timeout, $stampname, $prefix, $cmd, $suffix) = @_;
target_cmd_build($ho, $timeout, $builddir, <<END);
- cd xen-unstable
+ cd xen
$prefix
( $cmd 2>&1 && touch ../$stampname-ok-stamp
) |tee ../$stampname-log
@@ -120,7 +120,7 @@ END
}
sub collectversions () {
- my $tools="$builddir/xen-unstable/tools";
+ my $tools="$builddir/xen/tools";
store_revision($ho, 'qemu', "$tools/ioemu-dir", 1);
store_revision($ho, 'qemu', "$tools/qemu-xen-traditional-dir", 1);
store_revision($ho, 'qemuu', "$tools/qemu-xen-dir", 1);
@@ -130,7 +130,7 @@ sub collectversions () {
sub divide () {
target_cmd_build($ho, 100, $builddir, <<END);
- cd xen-unstable/dist
+ cd xen/dist
mkdir xeninstall
for f in *install; do
mkdir -p \$f/lib
@@ -147,13 +147,13 @@ END
sub stash () {
foreach my $part ('', 'xen') {
built_stash($ho, $builddir,
- "xen-unstable/dist/${part}install",
+ "xen/dist/${part}install",
"${part}dist");
}
- built_stash_file($ho, $builddir, "xen-syms", "xen-unstable/xen/xen-syms", 1);
- built_stash_file($ho, $builddir, "xen-config", "xen-unstable/.config", 1);
+ built_stash_file($ho, $builddir, "xen-syms", "xen/xen/xen-syms", 1);
+ built_stash_file($ho, $builddir, "xen-config", "xen/.config", 1);
built_stash_file($ho, $builddir, "seabios-config",
- "xen-unstable/tools/firmware/seabios-dir-remote/.config", 1);
+ "xen/tools/firmware/seabios-dir-remote/.config", 1);
built_compress_stashed("xen-syms");
}
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH OSSTEST v3 5/6] standalone: allow making a baseline flight.
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
` (3 preceding siblings ...)
2014-05-15 10:30 ` [PATCH OSSTEST v3 4/6] ts-xen-build: Move Xen build tree from xen-unstable to just xen Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:18 ` Ian Jackson
2014-05-15 10:30 ` [PATCH OSSTEST v3 6/6] sg-run-job: check for prerequisite builds when running build jobs Ian Campbell
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
While there make the existing --lvextend argument actually work (by passing it
to getopt) and document both.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
standalone | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/standalone b/standalone
index 36f02ba..0f491c1 100755
--- a/standalone
+++ b/standalone
@@ -8,7 +8,7 @@ usage: standalone [operations] [options...]
Operations:
-* make-flight [cf] [BRANCH]
+* make-flight [cf,lvextendmax,baseline] [BRANCH]
Create a flight testing the named branch.
@@ -36,6 +36,8 @@ Options:
-h HOST, --host=HOST Test host
-r, --reuse Do not wipe test host (default)
-R, --noreuse, --noreinstall Wipe the test host (if job or test does so)
+--lvextendmax=GB Limit the size of the build logical volume
+--baseline Create a baseline flight instead of a tip flight
--help This message
@@ -55,7 +57,7 @@ if [ x$op = x--help ] ; then
exit 0
fi
-TEMP=$(getopt -o c:f:h:rR --long config:,flight:,host:,reuse,noreuse,reinstall,help -- "$@")
+TEMP=$(getopt -o c:f:h:rR --long config:,flight:,host:,reuse,noreuse,reinstall,lvextendmax:,baseline,help -- "$@")
eval set -- "$TEMP"
@@ -64,6 +66,7 @@ flight="standalone"
host=
reuse=1 # Don't blow away machines by default
lvextendmax=50 # Leave some LVM space free for running tests
+nobaseline=y
while true ; do
case "$1" in
@@ -73,6 +76,7 @@ while true ; do
-r|--reuse) reuse=1; shift 1;;
-R|--noreuse|--reinstall)reuse=0;shift 1;;
--lvextendmax)lvextendmax=$2; shift 2;;
+ --baseline)nobaseline=n; shift 1;;
--help) usage; exit 0;;
--) shift ; break ;;
*) echo "Internal error!" ; exit 1 ;;
@@ -163,7 +167,7 @@ case $op in
BUILD_LVEXTEND_MAX="$lvextendmax" \
OSSTEST_FLIGHT=$flight \
OSSTEST_CONFIG=$config \
- OSSTEST_NO_BASELINE=y \
+ OSSTEST_NO_BASELINE=$nobaseline \
with_logging logs/$flight/make-flight.log ./cr-daily-branch $@ $branch
;;
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH OSSTEST v3 6/6] sg-run-job: check for prerequisite builds when running build jobs
2014-05-15 10:29 [PATCH OSSTEST v3 0/6] test mainline qemu and seabios branches Ian Campbell
` (4 preceding siblings ...)
2014-05-15 10:30 ` [PATCH OSSTEST v3 5/6] standalone: allow making a baseline flight Ian Campbell
@ 2014-05-15 10:30 ` Ian Campbell
2014-05-16 17:19 ` Ian Jackson
5 siblings, 1 reply; 13+ messages in thread
From: Ian Campbell @ 2014-05-15 10:30 UTC (permalink / raw)
To: ian.jackson, xen-devel; +Cc: Ian Campbell
For example build-$ARCH-libvirt depends on build-$ARCH for the Xen bits.
Performing this check early saves allocating, installing, preparating etc a
host just to find the prerequisite is missing.
Rename ts-xen-build-check to ts-build-check while we are there. The script
checks all prerequisite builds, not just Xen.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
sg-run-job | 6 ++++--
ts-build-check | 37 +++++++++++++++++++++++++++++++++++++
ts-xen-build-check | 37 -------------------------------------
3 files changed, 41 insertions(+), 39 deletions(-)
create mode 100755 ts-build-check
delete mode 100755 ts-xen-build-check
diff --git a/sg-run-job b/sg-run-job
index 560fead..13f2c70 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -87,7 +87,7 @@ proc catching-otherwise {failst script} {
}
proc check-not-blocked {} {
- run-ts blocked * ts-xen-build-check
+ run-ts blocked * ts-build-check
}
proc setstatus {st} {
@@ -327,7 +327,9 @@ proc run-job/build-libvirt {} {
}
proc prepare-build-host {} {
- global jobinfo
+ global jobinfo ok
+ catching-otherwise blocked check-not-blocked
+ if {!$ok} return
run-ts broken = ts-hosts-allocate + host
run-ts broken host-install(*) ts-host-install-twice
run-ts . host-build-prep ts-xen-build-prep
diff --git a/ts-build-check b/ts-build-check
new file mode 100755
index 0000000..0ae3be8
--- /dev/null
+++ b/ts-build-check
@@ -0,0 +1,37 @@
+#!/usr/bin/perl -w
+# 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/>.
+
+use Osstest;
+use Osstest::TestSupport;
+
+tsreadconfig();
+
+die if @ARGV && $ARGV[0] =~ m/^-/;
+
+logm("checking builds ...");
+
+foreach my $k (sort keys %r) {
+ next unless $k =~ m/^(?:.*_)?([^_]*)buildjob$/;
+ my $part= $1;
+ my $path= "path_${part}dist";
+ logm("checking $k $path");
+ get_stashed($path, $r{$k});
+}
+
+logm("all ok.");
+
+exit 0;
diff --git a/ts-xen-build-check b/ts-xen-build-check
deleted file mode 100755
index 0ae3be8..0000000
--- a/ts-xen-build-check
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -w
-# 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/>.
-
-use Osstest;
-use Osstest::TestSupport;
-
-tsreadconfig();
-
-die if @ARGV && $ARGV[0] =~ m/^-/;
-
-logm("checking builds ...");
-
-foreach my $k (sort keys %r) {
- next unless $k =~ m/^(?:.*_)?([^_]*)buildjob$/;
- my $part= $1;
- my $path= "path_${part}dist";
- logm("checking $k $path");
- get_stashed($path, $r{$k});
-}
-
-logm("all ok.");
-
-exit 0;
--
1.9.0
^ permalink raw reply related [flat|nested] 13+ messages in thread