[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 2cc0f20 some css elements are standard now, now brwowser specific
names needed for those
from bbaa8f3 use download.samba.org::ftp/unpacked/
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 2cc0f2046739be3e264c157197b9a463b09d3f27
Author: Björn Jacke b...@sernet.de
Date: Sat Jul 25 21:46:04 2015 +0200
some css elements are standard now, now brwowser specific names needed for
those
---
Summary of changes:
web/build_farm.css | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/web/build_farm.css b/web/build_farm.css
index 7a8e3fd..83abeaa 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -300,7 +300,7 @@ table.buildtable td{
pre::-webkit-scrollbar-track
{
- -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+ box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
@@ -314,7 +314,7 @@ pre::-webkit-scrollbar
pre::-webkit-scrollbar-thumb
{
border-radius: 10px;
- -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+ box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #D62929;
}
@@ -386,19 +386,13 @@ pre::-webkit-scrollbar-thumb
width: 110px;
margin: 0;
- -webkit-border-radius:4px;
- -moz-border-radius:4px;
border-radius:4px;
- -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
- -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
background: #d9d9d9;
color:#33;
border:none;
outline:none;
display: inline-block;
- -webkit-appearance:none;
- -moz-appearance:none;
appearance:none;
cursor:pointer;
}
@@ -406,7 +400,7 @@ pre::-webkit-scrollbar-thumb
.newform button,
.newform input,
#newbuildmenu input{
- border: 1px solid #df0909; -webkit-border-radius: 3px;
-moz-border-radius: 3px;border-radius: 3px;font-size:12px;font-family:arial,
helvetica, sans-serif; padding: 0px 2px 0px 2px; text-decoration:none;
display:inline-block;text-shadow: -1px -1px 0 rgba(0,0,0,0.3);font-weight:bold;
color: #FF;
+ border: 1px solid #df0909; border-radius:
3px;font-size:12px;font-family:arial, helvetica, sans-serif; padding: 0px 2px
0px 2px; text-decoration:none; display:inline-block;text-shadow: -1px -1px 0
rgba(0,0,0,0.3);font-weight:bold; color: #FF;
background-color: #f62b2b; background-image: -webkit-gradient(linear,
left top, left bottom, from(#f62b2b), to(#d20202));
background-image: -webkit-linear-gradient(top, #f62b2b, #d20202);
background-image: -moz-linear-gradient(top, #f62b2b, #d20202);
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via bbaa8f3 use download.samba.org::ftp/unpacked/
from 6ccf7e2 Use cksum(1) instead of sum(1). Some operating systems such
as OpenBSD do not have sum(1). POSIX OS's have cksum(1).
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit bbaa8f3bf3a38c7c1d5f7d02a90a8bcc7b440c7a
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jul 10 11:02:46 2015 +0200
use download.samba.org::ftp/unpacked/
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
build_test.fns | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 6fa841d..7fad7f1 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -118,7 +118,7 @@ fetch_tree() {
fetchtree=$1
if rsync --exclude=autom4te.cache/ --exclude=.svn/
--exclude=.git/ \
--delete-excluded -q --partial --timeout=200 -ctrlpz
--delete --ignore-errors \
- samba.org::ftp/unpacked/$fetchtree/
$test_root/$fetchtree; then
+ download.samba.org::ftp/unpacked/$fetchtree/
$test_root/$fetchtree; then
echo transferred $fetchtree OK
else
echo transfer of $fetchtree failed code $?
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 6ccf7e2 Use cksum(1) instead of sum(1). Some operating systems such
as OpenBSD do not have sum(1). POSIX OS's have cksum(1).
from ff8e6d7 Update the trees currently used by the build farm to build
samba.
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 6ccf7e293a97bdd7844e5915dee2615aaa7ee3ab
Author: Brad Smith b...@comstyle.com
Date: Sat May 2 08:18:29 2015 -0400
Use cksum(1) instead of sum(1). Some operating systems such as OpenBSD do
not have sum(1). POSIX OS's have cksum(1).
---
Summary of changes:
build_test.fns | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 29d77b8..6fa841d 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -38,23 +38,23 @@ sum_tree() {
sum_tree_tree=$2
sum_tree_sum=$3
sum_tree_scm=$4
- find $sum_tree_test_root/$sum_tree_tree -type f -print | grep -v
version.h | sort | xargs sum $sum_tree_sum
- sum build_test build_test.fns $sum_tree_sum
+ find $sum_tree_test_root/$sum_tree_tree -type f -print | grep -v
version.h | sort | xargs cksum $sum_tree_sum
+ cksum build_test build_test.fns $sum_tree_sum
if [ -f $host.fns ]; then
- sum $host.fns $sum_tree_sum
+ cksum $host.fns $sum_tree_sum
else
- sum generic.fns $sum_tree_sum
+ cksum generic.fns $sum_tree_sum
fi
if [ -f $test_root/$tree.$scm ]; then
- sum $test_root/$tree.$scm $sum_tree_sum
+ cksum $test_root/$tree.$scm $sum_tree_sum
fi
for d in $deptrees; do
dscm=`choose_scm $d`
if [ -f $test_root/$d.$dscm ]; then
- sum $test_root/$d.$dscm $sum_tree_sum
+ cksum $test_root/$d.$dscm $sum_tree_sum
fi
done
}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via ff8e6d7 Update the trees currently used by the build farm to build
samba.
from 51dcd52 Lower the maximum block size used with rsync down to the
maximum acceptable size for modern versions of rsync (128KB).
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit ff8e6d7ccaac87d9aeadbc4160eead2df45366b0
Author: Brad Smith b...@comstyle.com
Date: Sat May 2 06:59:58 2015 -0400
Update the trees currently used by the build farm to build samba.
---
Summary of changes:
SerNet-IRIX.fns | 7 +++
SerNet-NetBSD5.fns | 7 +++
SerNet-Tru64.fns| 7 +++
SerNet-imini.fns| 6 +++---
SerNet-solaris8.fns | 6 +++---
build_test.fns | 10 +++---
coverage.fns| 7 +++
hape.fns| 11 ---
hpisgr8.fns | 7 +++
kilkenny.fns| 7 +++
tridge.fns | 7 +++
11 files changed, 34 insertions(+), 48 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index cdcb6cb..afb1b3f 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -15,10 +15,9 @@ for compiler in $compilers; do
#export config=--with-included-popt
. common.fns
- test_tree samba_4_0_test . $compiler
-
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
done
global_unlock
diff --git a/SerNet-NetBSD5.fns b/SerNet-NetBSD5.fns
index 91c958f..a3e24e6 100644
--- a/SerNet-NetBSD5.fns
+++ b/SerNet-NetBSD5.fns
@@ -9,11 +9,10 @@ for compiler in $compilers; do
. common.fns
export config=--without-acl-support
- test_tree samba_4_0_test . $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
export config=
-
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
done
global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 3571b60..ded96c9 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -18,12 +18,11 @@ for compiler in $compilers; do
config=--without-acl-support
export config
- test_tree samba_4_0_test . $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
config=
export config
-
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
done
global_unlock
diff --git a/SerNet-imini.fns b/SerNet-imini.fns
index 91c958f..6d60518 100644
--- a/SerNet-imini.fns
+++ b/SerNet-imini.fns
@@ -9,11 +9,11 @@ for compiler in $compilers; do
. common.fns
export config=--without-acl-support
- test_tree samba_4_0_test . $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
export config=
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
done
global_unlock
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 0788ce8..a46a943 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -34,9 +34,9 @@ for compiler in $compilers; do
. common.fns
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
- test_tree samba_4_0_test . $compiler
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
done
diff --git a/build_test.fns b/build_test.fns
index aec66d4..29d77b8 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -640,7 +640,7 @@ test_tree() {
deptrees=
case $tree in
samba-gtk)
- deptrees=samba_4_0_test
+ deptrees=samba_current
;;
esac
@@ -750,15 +750,11 @@ test_tree() {
lorikeet-heimdal)
sw_config=$config --enable-socket-wrapper
;;
- samba_4*)
+ samba_*)
sw_config=$config --enable-selftest
;;
- samba_3*)
- sw_config=$config --enable-socket-wrapper
- sw_config=$sw_config --enable-nss-wrapper
- ;;
samba-gtk)
-
PKG_CONFIG_PATH=$test_root/prefix/samba_4_0_test.$compiler/lib/pkgconfig
+
PKG_CONFIG_PATH=$test_root/prefix/samba_current.$compiler/lib/pkgconfig
export PKG_CONFIG_PATH
;;
*)
diff --git
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 51dcd52 Lower the maximum block size used with rsync down to the
maximum acceptable size for modern versions of rsync (128KB).
from 942ce41 update and rename buildfarm branches
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 51dcd52453b0a5371ec983d2fb73506707d8f4b0
Author: Brad Smith b...@comstyle.com
Date: Wed Apr 22 02:23:27 2015 -0400
Lower the maximum block size used with rsync down to the maximum acceptable
size for modern versions of rsync (128KB).
Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
---
Summary of changes:
build_test.fns | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 2d45fb4..aec66d4 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -104,7 +104,7 @@ send_logs() {
send_logs_skip() {
touch $1 $2
- send_logs $1 $2 -B 1000
+ send_logs $1 $2 -B 131072
}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 942ce41 update and rename buildfarm branches
from a06fd7e Revert build_test.fns: use
--with-perl-{lib,arch}-install-dir= for samba_4_*
https://git.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 942ce41e5b8e617155ac80340b631819ff409095
Author: Björn Jacke b...@sernet.de
Date: Wed Sep 17 17:42:06 2014 +0200
update and rename buildfarm branches
samba_4_0_test - samba_master
samba_3_current samba_current (now set to v4-1-test)
samba_3_next samba_next (now set to v4-2-test)
---
Summary of changes:
build_test.fns |1 +
generic.fns|6 +++---
web/trees.conf | 14 +++---
3 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 1f00620..2d45fb4 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -1047,6 +1047,7 @@ per_run_hook() {
old_trees=web popt distcc samba-gtk smb-build lorikeet-heimdal
samba_3_2
old_trees=$old_tree samba_3_2_test samba4 samba_4_0_waf
samba_4_0_waf.metze
old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master tdb2
+ old_trees=$old_tree samba_3_current samba_3_next samba_4_0_test
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/generic.fns b/generic.fns
index 74e1a67..97937a7 100644
--- a/generic.fns
+++ b/generic.fns
@@ -46,7 +46,6 @@ for compiler in $compilers; do
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
-test_tree samba_4_0_test . $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
@@ -61,8 +60,9 @@ for compiler in $compilers; do
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
- test_tree samba_3_current source3 $compiler
- test_tree samba_3_next source3 $compiler
+ test_tree samba_current . $compiler
+ test_tree samba_next . $compiler
+ test_tree samba_master . $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/web/trees.conf b/web/trees.conf
index 184fcb6..1b0af00 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -18,19 +18,19 @@ scm = git
repo = samba-web.git
branch = trunk
-[samba_3_current]
+[samba_current]
scm = git
repo = samba.git
-branch = v3-5-test
-srcdir = source3
+branch = v4-1-test
+srcdir = .
-[samba_3_next]
+[samba_next]
scm = git
repo = samba.git
-branch = v3-6-test
-srcdir = source3
+branch = v4-2-test
+srcdir = .
-[samba_4_0_test]
+[samba_master]
scm = git
repo = samba.git
branch = master
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via a06fd7e Revert build_test.fns: use
--with-perl-{lib,arch}-install-dir= for samba_4_*
from 24fb6cf Revert Reuse DEADAGE rather than defining our own
constant.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit a06fd7e6d25f511fdf912c54f2726aa8364349a6
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 8 22:41:08 2014 +0200
Revert build_test.fns: use --with-perl-{lib,arch}-install-dir= for
samba_4_*
This reverts commit 10745f4381032a1a58fbee270b339432e8e2ad8e.
This is not needed anymore.
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
build_test.fns |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 3d66fc5..1f00620 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -752,8 +752,6 @@ test_tree() {
;;
samba_4*)
sw_config=$config --enable-selftest
- sw_config=$sw_config
--with-perl-lib-install-dir=$prefix/perl.lib
- sw_config=$sw_config
--with-perl-arch-install-dir=$prefix/perl.arch
;;
samba_3*)
sw_config=$config --enable-socket-wrapper
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 4cc7c29 Re-enable buildfarm tests. via b60f215 Reuse DEADAGE rather than defining our own constant. from 295dc1a Add constant for maximum build age. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 4cc7c2975425c558ad8c4c3dfd689ad09f0d3760 Author: Jelmer Vernooij jel...@samba.org Date: Mon Aug 18 21:46:28 2014 +0200 Re-enable buildfarm tests. commit b60f215d1fa2f04bee4c650efbba629a215fda6f Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:43:06 2014 +0200 Reuse DEADAGE rather than defining our own constant. --- Summary of changes: TODO |1 + buildfarm/tests/__init__.py |1 + buildfarm/tests/test_buildfarm.py |8 ++-- buildfarm/web/__init__.py |7 +-- 4 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 TODO Changeset truncated at 500 lines: diff --git a/TODO b/TODO new file mode 100644 index 000..1480b02 --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +- age is misnamed diff --git a/buildfarm/tests/__init__.py b/buildfarm/tests/__init__.py index bc66ab1..d5abd68 100644 --- a/buildfarm/tests/__init__.py +++ b/buildfarm/tests/__init__.py @@ -109,6 +109,7 @@ def test_suite(): names = [ '__init__', 'test_build', +'test_buildfarm', 'test_history', 'test_hostdb', 'test_sqldb', diff --git a/buildfarm/tests/test_buildfarm.py b/buildfarm/tests/test_buildfarm.py index 417576b..2cc1b33 100644 --- a/buildfarm/tests/test_buildfarm.py +++ b/buildfarm/tests/test_buildfarm.py @@ -131,12 +131,8 @@ class BuildFarmTests(BuildFarmTestCase): BUILD COMMIT REVISION: 42\n, mtime=4200) builds = list(self.x.get_summary_builds()) self.assertEquals(2, len(builds)) -self.assertEquals(4200, builds[0].upload_time) -self.assertEquals(42, builds[0].revision_details()) -self.assertEquals(trivial, builds[0].tree) -self.assertEquals(1200, builds[1].upload_time) -self.assertEquals(12, builds[1].revision_details()) -self.assertEquals(other, builds[1].tree) +self.assertEquals(other, builds[0][0]) +self.assertEquals(trivial, builds[1][0]) builds = list(self.x.get_summary_builds(min_age=4000)) self.assertEquals(1, len(builds)) builds = list(self.x.get_summary_builds(min_age=5000)) diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 7cd1a7e..3b3c38d 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -58,11 +58,6 @@ webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., we GITWEB_BASE = https://gitweb.samba.org; HISTORY_HORIZON = 1000 -# Maximum age of builds to consider when displaying summary page statistics. -# Note that trees only get rebuilt when they change, so this value is -# intentionally set to a high value to cope with trees that don't change often. -SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60) - # this is automatically filled in deadhosts = [] @@ -732,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = -builds = self.buildfarm.get_summary_builds(min_age=time.time() - SUMMARY_MAX_BUILD_AGE) +builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE) for tree, status in builds: host_count[tree]+=1 -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 742f79b http - https from 4cc7c29 Re-enable buildfarm tests. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 742f79b65d1c28353d598086441dfab004add15f Author: Jelmer Vernooij jel...@samba.org Date: Mon Aug 18 22:01:27 2014 +0200 http - https --- Summary of changes: admin.py |2 +- import-and-analyse.py |2 +- mail-dead-hosts.py|4 ++-- web/about.html|4 ++-- web/header3.html | 12 ++-- web/instructions.html |8 6 files changed, 16 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/admin.py b/admin.py index b78fb32..fa317f3 100755 --- a/admin.py +++ b/admin.py @@ -142,7 +142,7 @@ Your host %(hostname)s has been added to the Samba Build farm. We have recorded that it is running %(platform)s. If you have not already done so, please read: -http://build.samba.org/instructions.html +https://build.samba.org/instructions.html The password for your rsync .password file is %(password)s diff --git a/import-and-analyse.py b/import-and-analyse.py index 2318cc1..6a22797 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -90,7 +90,7 @@ The build may have been broken by one of the following commits: old_rev: diff.old_rev, cur_status: diff.new_status, old_status: diff.old_status, -build_link: build_uri(http://build.samba.org/build.cgi;, cur) +build_link: build_uri(https://build.samba.org/build.cgi;, cur) } msg = MIMEText(body) diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py index 56ca811..b83ce4b 100755 --- a/mail-dead-hosts.py +++ b/mail-dead-hosts.py @@ -42,7 +42,7 @@ for host in hosts: body = Your host %s has been part of the Samba Build farm, hosted -at http://build.samba.org/. +at https://build.samba.org/. Sadly however we have not heard from it since %s. @@ -59,7 +59,7 @@ Thanks, The Build Farm administration team. - % (host.name, last_update, host_uri(http://build.samba.org/build.cgi;, host.name)) + % (host.name, last_update, host_uri(https://build.samba.org/build.cgi;, host.name)) msg = MIMEText(body) diff --git a/web/about.html b/web/about.html index 05e0117..acd6825 100644 --- a/web/about.html +++ b/web/about.html @@ -11,7 +11,7 @@ real time. Each host in the build farm builds each of the projects regularly (currently every 15 minutes for some hosts) and uploads the results of the configure, build, install, and runtime testing to the central site - (a href=http://build.samba.org/;build.samba.org/a) for display. + (a href=https://build.samba.org/;build.samba.org/a) for display. /p p @@ -22,7 +22,7 @@ p The build farm pulls the source code from the a - href=http://www.samba.org/ftp/unpacked/;unpacked Git + href=https://www.samba.org/ftp/unpacked/;unpacked Git repository/a and does a clean configure and build whenever a change is detected in the tree. The results shown give information on the status of the configure and build process, plus any error logs. diff --git a/web/header3.html b/web/header3.html index ab9a540..526d766 100644 --- a/web/header3.html +++ b/web/header3.html @@ -11,16 +11,16 @@ ul lia href=/about.htmlAbout the build farm/a/li lia href=/instructions.htmlAdding a new machine/a/li -lia href=http://www.samba.org/;Samba Web pages/a/li +lia href=https://www.samba.org/;Samba Web pages/a/li /ul img src=/hack.png alt=hack samba / ul -lia href=http://www.samba.org/samba/devel/;Devel Overview/a/li -lia href=http://gitweb.samba.org;Git Source/a/li -lia href=http://websvn.samba.org;Historical SVN Source/a/li -lia href=http://cvs.samba.org/cgi-bin/cvsweb/;Historical CVS Source/a/li -lia href=http://build.samba.org/;Build Farm/a/li +lia href=https://www.samba.org/samba/devel/;Devel Overview/a/li +lia href=https://gitweb.samba.org;Git Source/a/li +lia href=https://websvn.samba.org;Historical SVN Source/a/li +lia href=https://cvs.samba.org/cgi-bin/cvsweb/;Historical CVS Source/a/li +lia href=https://build.samba.org/;Build Farm/a/li lia href=https://bugzilla.samba.org;Bug Reports/a/li /ul diff --git a/web/instructions.html b/web/instructions.html index 3bdf079..68f4cff 100644 --- a/web/instructions.html +++ b/web/instructions.html @@ -47,19 +47,19 @@ If you have a machine that you wish to add to our build farm then please follow account, no special privileges are needed, just change ~build to your home directory in the instructions below./li - liMake sure a recent version of a href=http://rsync.samba.org/;rsync/a + liMake sure a recent version of a href=https://rsync.samba.org/;rsync/a is installed on the machine/li liCreate a directory
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via cd17a96 Update Samba build farm to new web site layout.
from 742f79b http - https
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit cd17a9658a2dbe90a881d36f27ad22d35e777fd6
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date: Mon Aug 18 22:07:38 2014 +0200
Update Samba build farm to new web site layout.
Reviewed-By: Jelmer Vernooij jel...@samba.org
---
Summary of changes:
.gitmodules |3 +
buildfarm/tests/test_util.py | 19 +++-
buildfarm/util.py| 24
buildfarm/web/__init__.py| 111 +++-
web/about.html |5 -
web/bannernav1.html | 32 +
web/bannernav2.html | 17 +++
web/build_farm.css | 286 +
web/closingtags.html |9 ++
web/instructions.html| 19 +--
web/samba-web|1 +
11 files changed, 445 insertions(+), 81 deletions(-)
create mode 100644 .gitmodules
create mode 100644 web/bannernav1.html
create mode 100644 web/bannernav2.html
create mode 100644 web/closingtags.html
create mode 16 web/samba-web
Changeset truncated at 500 lines:
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..765c2d8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule web/samba-web]
+ path = web/samba-web
+ url = https://git.samba.org/samba-web.git
diff --git a/buildfarm/tests/test_util.py b/buildfarm/tests/test_util.py
index a727ee2..fbd8f24 100755
--- a/buildfarm/tests/test_util.py
+++ b/buildfarm/tests/test_util.py
@@ -40,7 +40,7 @@ class LoadTests(testtools.TestCase):
f = os.fdopen(fd, 'w')
f.write(one
two
-three
+three
for
)
@@ -49,4 +49,21 @@ for
self.assertEquals(4, len(l))
self.assertEquals(three, l[2])
+class SambaWebFileLoadTest(testtools.TestCase):
+
+def test_simple(self):
+fd, name = tempfile.mkstemp()
+self.addCleanup(os.remove, name)
+f = os.fdopen(fd, 'w')
+f.write('href=/samba/index.html')
+f.close()
+l = util.SambaWebFileLoad(os.getcwd(),name)
+self.assertEquals('href=http://www.samba.org/samba/index.html;', l)
+fd1, name1 = tempfile.mkstemp()
+self.addCleanup(os.remove, name1)
+f1 = os.fdopen(fd1, 'w')
+f1.write('!--#include virtual=/samba/name2 --')
+f1.close()
+l1 =
util.SambaWebFileLoad(os.path.dirname(os.path.realpath(name1)),name1)
+self.assertEquals('', l1)
diff --git a/buildfarm/util.py b/buildfarm/util.py
index 9d6c8ca..9ce71ca 100644
--- a/buildfarm/util.py
+++ b/buildfarm/util.py
@@ -17,6 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+import re
+import os
+
def load_list(fname):
load a list from a file, using : to separate
ret = []
@@ -40,6 +43,27 @@ def FileLoad(filename):
finally:
f.close()
+def SambaWebFileLoad(webdir, filename):
+loads file and changes the links to suit buildfarm
+try:
+f = open(os.path.join(webdir, filename), 'r')
+text = f.read()
+except IOError:
+return ''
+else:
+f.close()
+def add_virtual_headers(m):
+try:
+f = open(os.path.join(webdir, m.group(1)), 'r')
+text = f.read()
+except:
+return ''
+else:
+f.close()
+return text
+text = re.sub('!--#include virtual=/samba/(.*) --',add_virtual_headers
, text)
+text = re.sub('href=/samba', 'href=http://www.samba.org/samba', text)
+return text
def dhm_time(sec):
display a time as days, hours, minutes
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 3b3c38d..8794978 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -55,7 +55,7 @@ import time
import wsgiref.util
webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., ..,
web))
-GITWEB_BASE = https://gitweb.samba.org;
+GITWEB_BASE = //gitweb.samba.org
HISTORY_HORIZON = 1000
# this is automatically filled in
@@ -418,7 +418,7 @@ class ViewBuildPage(BuildFarmPage):
yield h2Older builds:/h2\n
-yield table class='real'\n
+yield table class='newtable'\n
yield
theadtrthRevision/ththStatus/ththAge/th/tr/thead\n
yield tbody\n
@@ -473,7 +473,7 @@ class ViewBuildPage(BuildFarmPage):
if os.path.exists(host_web_file):
yield util.FileLoad(host_web_file)
-yield table class='real'\n
+yield table class='newtable'\n
yield trtdHost:/tdtda
href='%s?function=View+Host;host=%s;tree=%s;\
compiler=%s#'%s/a -
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 24fb6cf Revert Reuse DEADAGE rather than defining our own constant. from 6f0134c Revert style changes on instructions page. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 24fb6cfe7e6a98c48fdb73c9926d85006d70fcc0 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 19 07:42:13 2014 +0200 Revert Reuse DEADAGE rather than defining our own constant. This reverts commit b60f215d1fa2f04bee4c650efbba629a215fda6f. This generates the following error: Traceback (most recent call last): File /usr/lib/python2.6/wsgiref/handlers.py, line 94, in run self.finish_response() File /usr/lib/python2.6/wsgiref/handlers.py, line 134, in finish_response for data in self.result: File /home/build/master/web/../buildfarm/web/__init__.py, line 1178, in __call__ yield .join(self.html_page(form, page.render_html(myself))) File /home/build/master/web/../buildfarm/web/__init__.py, line 1017, in html_page yield .join(lines) File /home/build/master/web/../buildfarm/web/__init__.py, line 757, in render_html (host_count, broken_count, panic_count) = self._get_counts() File /home/build/master/web/../buildfarm/web/__init__.py, line 730, in _get_counts builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE) NameError: global name 'BuildFarm' is not defined Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: TODO |1 - buildfarm/web/__init__.py |7 ++- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 TODO Changeset truncated at 500 lines: diff --git a/TODO b/TODO deleted file mode 100644 index 1480b02..000 --- a/TODO +++ /dev/null @@ -1 +0,0 @@ -- age is misnamed diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 8794978..7ba04c5 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -58,6 +58,11 @@ webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., we GITWEB_BASE = //gitweb.samba.org HISTORY_HORIZON = 1000 +# Maximum age of builds to consider when displaying summary page statistics. +# Note that trees only get rebuilt when they change, so this value is +# intentionally set to a high value to cope with trees that don't change often. +SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60) + # this is automatically filled in deadhosts = [] @@ -727,7 +732,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = -builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE) +builds = self.buildfarm.get_summary_builds(min_age=time.time() - SUMMARY_MAX_BUILD_AGE) for tree, status in builds: host_count[tree]+=1 -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 0996a81 Fix whitespace, add basic tests for get_summary_builds. via 9fe0dc1 Merge branch 'query4summarypage' of git://github.com/krishnatejaperannagari/build-farm into summary-optimization via 9dee960 changes to reviews via 0ca8317 query and conversion completed from 338f129 Remove trailing whitespace. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 0996a81eab145e1f866ed1b03e043712a35ec2a5 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 20:11:18 2014 +0200 Fix whitespace, add basic tests for get_summary_builds. commit 9fe0dc147edce633cbf2cd333d1ba0d98f878394 Merge: 338f129aae35054dd350677b19170279549c22db 9dee960b26fa090b2d0fb8449430e95246f8998c Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 20:03:58 2014 +0200 Merge branch 'query4summarypage' of git://github.com/krishnatejaperannagari/build-farm into summary-optimization commit 9dee960b26fa090b2d0fb8449430e95246f8998c Author: krishnatejaperannagari krishnatejaperannag...@gmail.com Date: Tue Jul 1 16:13:53 2014 +0530 changes to reviews Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com commit 0ca8317f8d3bfc552dc9859c2a8e5edd0f428a35 Author: krishnatejaperannagari krishnatejaperannag...@gmail.com Date: Mon Jun 23 14:03:26 2014 +0530 query and conversion completed Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com --- Summary of changes: buildfarm/__init__.py | 21 + buildfarm/build.py|3 +-- buildfarm/tests/test_buildfarm.py | 19 +++ buildfarm/web/__init__.py | 11 +-- 4 files changed, 46 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index 7c4428e..52ac085 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +from buildfarm.build import BuildStatus from buildfarm.sqldb import distinct_builds, Cast, StormBuild, setup_schema, StormHostDatabase from buildfarm.tree import Tree from storm.database import create_database @@ -143,6 +144,26 @@ class BuildFarm(object): result = self._get_store().find(StormBuild) return distinct_builds(result.order_by(Desc(StormBuild.upload_time))) +def get_summary_builds(self): +Return last build age, status for each tree/host/compiler. + +:return: iterator over tree, status + +store = self._get_store() +return ((tree, BuildStatus.__deserialize__(status_str)) +for (tree, status_str) in store.execute( +SELECT obd.tree, obd.status AS status_str +FROM build obd +INNER JOIN( +SELECT MAX(age) age, tree, host, compiler +FROM build +GROUP BY tree, host, compiler +) ibd ON obd.age = ibd.age AND + obd.tree = ibd.tree AND + obd.host = ibd.host AND + obd.compiler = ibd.compiler; +)) + def get_tree_builds(self, tree): result = self._get_store().find(StormBuild, Cast(StormBuild.tree, TEXT) == Cast(tree, TEXT)) diff --git a/buildfarm/build.py b/buildfarm/build.py index fae37a1..1348a96 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -566,8 +566,7 @@ class BuildResultStore(object): os.link(build.basename+.log, new_basename+.log) if os.path.exists(build.basename+.err): os.link(build.basename+.err, new_basename+.err) -new_build = StormBuild(new_basename, build.tree, build.host, -build.compiler, rev) +new_build = StormBuild(new_basename, build.tree, build.host, build.compiler, rev) new_build.checksum = build.log_checksum() new_build.upload_time = build.upload_time new_build.status_str = build.status().__serialize__() diff --git a/buildfarm/tests/test_buildfarm.py b/buildfarm/tests/test_buildfarm.py index d78ed68..9091bf8 100644 --- a/buildfarm/tests/test_buildfarm.py +++ b/buildfarm/tests/test_buildfarm.py @@ -119,6 +119,25 @@ class BuildFarmTests(BuildFarmTestCase): self.assertEquals(12, builds[1].revision_details()) self.assertEquals(other, builds[1].tree) +def test_get_summary_builds_empty(self): +self.assertEquals([], list(self.x.get_summary_builds())) + +def test_get_summary_builds(self): +path = self.upload_mock_logfile(self.x.builds, other, myhost, cc, +BUILD COMMIT REVISION: 12\n, mtime=1200) +path = self.upload_mock_logfile(self.x.builds, trivial, myhost, cc, +BUILD COMMIT REVISION: 13\n, mtime=1300) +path =
[SCM] build.samba.org - branch master updated
The branch, master has been updated via c5f371b Only show builds in the last seven days. from 0996a81 Fix whitespace, add basic tests for get_summary_builds. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit c5f371b907ef13bef16bd4ac8be29e0fc7961882 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:23:22 2014 +0200 Only show builds in the last seven days. --- Summary of changes: buildfarm/__init__.py |6 -- buildfarm/web/__init__.py |2 +- 2 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index 52ac085..933e5fd 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -144,9 +144,10 @@ class BuildFarm(object): result = self._get_store().find(StormBuild) return distinct_builds(result.order_by(Desc(StormBuild.upload_time))) -def get_summary_builds(self): +def get_summary_builds(self, min_age=0): Return last build age, status for each tree/host/compiler. +:param min_age: Minimum timestamp of builds to report :return: iterator over tree, status store = self._get_store() @@ -157,12 +158,13 @@ FROM build obd INNER JOIN( SELECT MAX(age) age, tree, host, compiler FROM build +WHERE age ? GROUP BY tree, host, compiler ) ibd ON obd.age = ibd.age AND obd.tree = ibd.tree AND obd.host = ibd.host AND obd.compiler = ibd.compiler; -)) +, min_age)) def get_tree_builds(self, tree): result = self._get_store().find(StormBuild, diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 0368022..bd29cc1 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -727,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = -builds = self.buildfarm.get_summary_builds() +builds = self.buildfarm.get_summary_builds(min_age=(7 * 24 * 60 * 60)) for tree, status in builds: host_count[tree]+=1 -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via ec031ac Add tests for new min_age argument. from c5f371b Only show builds in the last seven days. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit ec031ac5beadd5d6d4d78214c705ed62d60be170 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:25:01 2014 +0200 Add tests for new min_age argument. --- Summary of changes: buildfarm/tests/test_buildfarm.py |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/tests/test_buildfarm.py b/buildfarm/tests/test_buildfarm.py index 9091bf8..417576b 100644 --- a/buildfarm/tests/test_buildfarm.py +++ b/buildfarm/tests/test_buildfarm.py @@ -137,6 +137,10 @@ class BuildFarmTests(BuildFarmTestCase): self.assertEquals(1200, builds[1].upload_time) self.assertEquals(12, builds[1].revision_details()) self.assertEquals(other, builds[1].tree) +builds = list(self.x.get_summary_builds(min_age=4000)) +self.assertEquals(1, len(builds)) +builds = list(self.x.get_summary_builds(min_age=5000)) +self.assertEquals(0, len(builds)) def test_get_host_builds_empty(self): self.assertEquals([], list(self.x.get_host_builds(myhost))) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 01ab8dc Use tuple for sqlite arguments - breaks on older versions of storm without. from ec031ac Add tests for new min_age argument. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 01ab8dc8abf928cf030a955cfae2ea680597ee24 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:28:52 2014 +0200 Use tuple for sqlite arguments - breaks on older versions of storm without. --- Summary of changes: buildfarm/__init__.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index 933e5fd..0e9eb39 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -164,7 +164,7 @@ INNER JOIN( obd.tree = ibd.tree AND obd.host = ibd.host AND obd.compiler = ibd.compiler; -, min_age)) +, (min_age, ))) def get_tree_builds(self, tree): result = self._get_store().find(StormBuild, -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via e73c92c min_age takes an absolute timestamp. from 01ab8dc Use tuple for sqlite arguments - breaks on older versions of storm without. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit e73c92c339ab3f90abe9c0465de713f0d95f50d1 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:37:01 2014 +0200 min_age takes an absolute timestamp. --- Summary of changes: buildfarm/web/__init__.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index bd29cc1..b66ffce 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -727,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = -builds = self.buildfarm.get_summary_builds(min_age=(7 * 24 * 60 * 60)) +builds = self.buildfarm.get_summary_builds(min_age=time.time() - (7 * 24 * 60 * 60)) for tree, status in builds: host_count[tree]+=1 -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 295dc1a Add constant for maximum build age. from e73c92c min_age takes an absolute timestamp. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 295dc1ad7e31efcb8313a0ad2fc4ab4683ee40d3 Author: Jelmer Vernooij jel...@samba.org Date: Sat Aug 2 21:39:37 2014 +0200 Add constant for maximum build age. --- Summary of changes: buildfarm/web/__init__.py |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index b66ffce..7cd1a7e 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -58,6 +58,11 @@ webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., we GITWEB_BASE = https://gitweb.samba.org; HISTORY_HORIZON = 1000 +# Maximum age of builds to consider when displaying summary page statistics. +# Note that trees only get rebuilt when they change, so this value is +# intentionally set to a high value to cope with trees that don't change often. +SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60) + # this is automatically filled in deadhosts = [] @@ -727,7 +732,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = -builds = self.buildfarm.get_summary_builds(min_age=time.time() - (7 * 24 * 60 * 60)) +builds = self.buildfarm.get_summary_builds(min_age=time.time() - SUMMARY_MAX_BUILD_AGE) for tree, status in builds: host_count[tree]+=1 -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 338f129 Remove trailing whitespace.
via 9ab3ded Merge remote-tracking branch
'krishna/recentcheckinimprovements'
via 7840268 changes to reviews 2
via 8257486 changes to reviews
via b43a773 recent checkins page speed improvements with hidng feature
from 4a37365 Add --debug-storm option.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 338f129aae35054dd350677b19170279549c22db
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Jul 11 02:19:38 2014 +0200
Remove trailing whitespace.
commit 9ab3ded91c65b715211293967846bd2d454a7921
Merge: 4a37365dc220a84e952c8214cf3b9acfcafe746a
78402689a044b11a94114d2d136b9dbba870238e
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Jul 11 02:17:43 2014 +0200
Merge remote-tracking branch 'krishna/recentcheckinimprovements'
commit 78402689a044b11a94114d2d136b9dbba870238e
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date: Mon Jul 7 20:50:27 2014 +0530
changes to reviews 2
Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com
commit 825748611865259a3d5336c5ff7f61015de5b29a
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date: Fri Jul 4 13:56:18 2014 +0530
changes to reviews
Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com
commit b43a77316d4500fe30b30d581f1915476e6058ac
Author: krishnatejaperannagari krishnatejaperannag...@gmail.com
Date: Tue Jun 17 11:37:54 2014 +0530
recent checkins page speed improvements with hidng feature
Signed-off-by: krishnatejaperannagari krishnatejaperannag...@gmail.com
---
Summary of changes:
buildfarm/web/__init__.py | 31 +++
1 files changed, 27 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 438d412..b1f0fb4 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -886,14 +886,15 @@ class DiffPage(HistoryPage):
class RecentCheckinsPage(HistoryPage):
-limit = 40
+limit = 10
-def render(self, myself, tree, author=None):
+def render(self, myself, tree, gitstart, author=None):
t = self.buildfarm.trees[tree]
interesting = list()
authors = {ALL: ALL}
branch = t.get_branch()
re_author = re.compile(^(.*) (.*)$)
+
for entry in branch.log(limit=HISTORY_HORIZON):
m = re_author.match(entry.author)
authors[m.group(2)] = m.group(1)
@@ -910,11 +911,28 @@ class RecentCheckinsPage(HistoryPage):
yield input type='hidden' name='function', value='Recent Checkins'/
yield /form
-for entry in interesting[:self.limit]:
+gitstop = gitstart + self.limit
+
+for entry in interesting[gitstart:gitstop]:
changes = branch.changes_summary(entry.revision)
yield .join(self.history_row_html(myself, entry, t, changes))
yield \n
+yield form method='GET'
+yield div class='newform'\n
+if gitstart != 0:
+yield button name='gitstart' type='submit' value= +
str(gitstart - self.limit) +
style='position:absolute;left:0px;'Previous/button
+if len(interesting) gitstop:
+yield button name='gitstart' type='submit' value= +
str(gitstop) + style='position:absolute;right:0px;'Next/button
+yield input type='hidden' name='function', value='Recent Checkins'/
+yield input type='hidden' name='gitcount' value='%s'/ % gitstop
+if author and author != ALL:
+yield input type='hidden' name='author' value='%s'/ % author
+yield input type='hidden' name='tree' value='%s'/ % tree
+yield /div\n
+yield /form
+yield br
+
class BuildFarmApp(object):
@@ -1020,8 +1038,13 @@ class BuildFarmApp(object):
elif fn_name == Recent_Checkins:
# validate the tree
author = get_param(form, 'author')
+gitstart = get_param(form, 'gitstart')
+if gitstart is None:
+gitstart = 0
+else:
+gitstart = int(gitstart)
page = RecentCheckinsPage(self.buildfarm)
-yield .join(self.html_page(form, page.render(myself, tree,
author)))
+yield .join(self.html_page(form, page.render(myself, tree,
gitstart, author)))
elif fn_name == diff:
revision = get_param(form, 'revision')
page = DiffPage(self.buildfarm)
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 4a37365 Add --debug-storm option. via b55c89d Simplify handling of old build limit showing. from 242950a Add some notes on running the build farm locally to README. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 4a37365dc220a84e952c8214cf3b9acfcafe746a Author: Jelmer Vernooij jel...@samba.org Date: Thu Jun 12 23:52:42 2014 +0200 Add --debug-storm option. commit b55c89d354e616f00ebcf5d6a31f86688a2a8765 Author: Jelmer Vernooij jel...@samba.org Date: Sat Jun 7 18:32:33 2014 +0200 Simplify handling of old build limit showing. --- Summary of changes: buildfarm/web/__init__.py | 22 +- 1 files changed, 13 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 08d577a..438d412 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/python # This CGI script presents the results of the build_farm build -# Copyright (C) Jelmer Vernooij jel...@samba.org 2010 +# Copyright (C) Jelmer Vernooij jel...@samba.org 2010-2014 # Copyright (C) Matthieu Patou m...@matws.net 2010-2012 # # Based on the original web/build.pl: @@ -33,6 +33,7 @@ from collections import defaultdict import os +import sys from buildfarm import ( hostdb, @@ -125,7 +126,8 @@ def build_uri(myself, build): def build_link(myself, build): -return a href='%s'%s/a % (build_uri(myself, build), html_build_status(build.status())) +return a href='%s'%s/a % ( +build_uri(myself, build), html_build_status(build.status())) def tree_uri(myself, tree): @@ -134,7 +136,8 @@ def tree_uri(myself, tree): def tree_link(myself, tree): return a link to a particular tree -return a href='%s' title='View recent builds for %s'%s:%s/a % (tree_uri(myself, tree), tree.name, tree.name, tree.branch) +return a href='%s' title='View recent builds for %s'%s:%s/a % ( +tree_uri(myself, tree), tree.name, tree.name, tree.branch) def host_uri(myself, host): @@ -404,7 +407,7 @@ class BuildFarmPage(object): class ViewBuildPage(BuildFarmPage): -def show_oldrevs(self, myself, build, host, compiler, limit): +def show_oldrevs(self, myself, build, host, compiler, limit=None): show the available old revisions, if any tree = build.tree @@ -419,11 +422,7 @@ class ViewBuildPage(BuildFarmPage): yield theadtrthRevision/ththStatus/ththAge/th/tr/thead\n yield tbody\n -nb = 0 -for old_build in old_builds: -if limit = 0 and nb = limit: -break -nb = nb + 1 +for old_build in old_builds[:limit]: yield trtd%s/tdtd%s/tdtd%s/td/tr\n % ( revision_link(myself, old_build.revision, tree), build_link(myself, old_build), @@ -1123,6 +1122,8 @@ class BuildFarmApp(object): if __name__ == '__main__': import optparse parser = optparse.OptionParser([options]) +parser.add_option(--debug-storm, help=Enable storm debugging, + default=False, action='store_true') parser.add_option(--port, help=Port to listen on [localhost:8000], default=localhost:8000, type=str) opts, args = parser.parse_args() @@ -1150,6 +1151,9 @@ if __name__ == '__main__': except ValueError: address = localhost port = opts.port +if opts.debug_storm: +from storm.tracer import debug +debug(True, stream=sys.stdout) httpd = make_server(address, int(port), standaloneApp) print Serving on %s:%d... % (address, int(port)) httpd.serve_forever() -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 242950a Add some notes on running the build farm locally to README. from 69dcf9f Update about page for buildfarm to mention sources are now in Git. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 242950a7095c2add03710de6ce7bed9db7a696d3 Author: Jelmer Vernooij jel...@samba.org Date: Mon Jun 2 01:05:17 2014 +0200 Add some notes on running the build farm locally to README. --- Summary of changes: README | 39 ++- 1 files changed, 38 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/README b/README index e1fe3fe..39c6366 100644 --- a/README +++ b/README @@ -1,8 +1,12 @@ This is the build system for build.samba.org tri...@samba.org, April 2001 +abart...@samba.org / jel...@samba.org, October 2010 -To set it up on a new box you need to do this: +New build machines +== + +To set up a new build machine, you need to do this: 1) create an account on the box (I'll assume its called build) 2) copy over build_test to ~build/build_farm/ @@ -14,3 +18,36 @@ To set it up on a new box you need to do this: 6) add the host to the buildfarm using admin.py. 7) if desired, create a HOSTNAME.fns file that defines what gets built on build.samba.org + +Running the site + + +The current build farm site is written in Python. It +manages a directory with raw build logs that get parsed and +displayed when viewing individual builds. + +A sqlite database is used to store metadata about builds +(to prevent rereading all the logs when e.g. creating +the summary page). Information about the build farm machines +and their owners can also be found in the sqlite database. + +You will need to have python-storm (our ORM), sqlite +and python-dulwich (pure-Python Git implementation) installed. +We don't use any fancy webby frameworks, everything just +outputs raw HTML. + +To run the web site locally, run: + + % python -m buildfarm.web.__init__ + +For build machine management, you can use the cli tool ./admin.py. +It should be fairly self-explanatory. + +Logs are initially uploaded to data/upload/. Once they are processed +and an entry has been created in the database for them, they are +moved over to data/oldrevs/. After they have been moved they should only be +accessed when the full build log output is viewed. + +There are some unit tests for the build farm objects. Run them using: + + % python -m unittest buildfarm.tests.test_suite -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 69dcf9f Update about page for buildfarm to mention sources are now in Git. from 326c4af Only create db directory if it does not yet exist. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 69dcf9f1f3371430500569062c415ac7f0b2fc7b Author: Jelmer Vernooij jel...@samba.org Date: Wed May 21 23:57:59 2014 +0200 Update about page for buildfarm to mention sources are now in Git. --- Summary of changes: web/about.html |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/web/about.html b/web/about.html index a26dfd4..05e0117 100644 --- a/web/about.html +++ b/web/about.html @@ -16,13 +16,13 @@ p This allows team members to check on the build status on a wide - variety of operating systems and architectures without the drudgery of - logging into each machine after each CVS commit. + variety of operating systems and architectures without the drudgery of + logging into each machine after each Git commit. /p p The build farm pulls the source code from the a - href=http://www.samba.org/ftp/unpacked/;unpacked CVS/Subversion + href=http://www.samba.org/ftp/unpacked/;unpacked Git repository/a and does a clean configure and build whenever a change is detected in the tree. The results shown give information on the status of the configure and build process, plus any error logs. @@ -32,7 +32,7 @@ p The author of the build farm is a href=mailto:tri...@samba.org;Andrew Tridgell/a. The source for the build farm is available in the build-farm - Subversion tree on the a href=http://svn.samba.org/;samba.org SVN + Git repository on the a href=https://git.samba.org/;samba.org Git server/a. /p -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 326c4af Only create db directory if it does not yet exist. from 4ba733a Create db directory if it did not yet exist. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 326c4af20b34726da9382673d4018e6ae58f18c1 Author: Jelmer Vernooij jel...@samba.org Date: Sun May 18 10:50:18 2014 +0200 Only create db directory if it does not yet exist. --- Summary of changes: buildfarm/__init__.py |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index ac6add9..7c4428e 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -159,7 +159,8 @@ class BuildFarm(object): if self.store is not None: return self.store db_dir_path = os.path.join(self.path, db) -os.mkdir(db_dir_path) +if not os.path.isdir(db_dir_path): +os.mkdir(db_dir_path) db_path = os.path.join(db_dir_path, hostdb.sqlite) db = create_database(sqlite:%s?timeout=%f % (db_path, self.timeout)) self.store = Store(db) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 4ba733a Create db directory if it did not yet exist. from 8a8c26c Add makefile with check target. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 4ba733af447860d96d8f090ad9c1dfafc935798d Author: Jelmer Vernooij jel...@samba.org Date: Sat May 17 13:36:02 2014 +0200 Create db directory if it did not yet exist. This is fallout from the svn - git migration, as git does not support empty directories. --- Summary of changes: buildfarm/__init__.py |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index 3708dc2..ac6add9 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -158,7 +158,9 @@ class BuildFarm(object): def _get_store(self): if self.store is not None: return self.store -db_path = os.path.join(self.path, db, hostdb.sqlite) +db_dir_path = os.path.join(self.path, db) +os.mkdir(db_dir_path) +db_path = os.path.join(db_dir_path, hostdb.sqlite) db = create_database(sqlite:%s?timeout=%f % (db_path, self.timeout)) self.store = Store(db) setup_schema(self.store) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 8a8c26c Add makefile with check target.
from 10745f4 build_test.fns: use --with-perl-{lib,arch}-install-dir= for
samba_4_*
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 8a8c26cc4778f315770ce805eaae29ffeae13f02
Author: Jelmer Vernooij jel...@samba.org
Date: Fri May 16 19:14:19 2014 +0200
Add makefile with check target.
---
Summary of changes:
Makefile |4
1 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 Makefile
Changeset truncated at 500 lines:
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..fda6019
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+PYTHON = python
+
+check:
+ $(PYTHON) -m unittest buildfarm.tests.test_suite
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 10745f4 build_test.fns: use --with-perl-{lib,arch}-install-dir= for
samba_4_*
from 90b2a36 mark tdb2 as an old tree to delete
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 10745f4381032a1a58fbee270b339432e8e2ad8e
Author: Stefan Metzmacher me...@samba.org
Date: Mon May 12 17:08:47 2014 +0200
build_test.fns: use --with-perl-{lib,arch}-install-dir= for samba_4_*
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
---
Summary of changes:
build_test.fns |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 1f00620..3d66fc5 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -752,6 +752,8 @@ test_tree() {
;;
samba_4*)
sw_config=$config --enable-selftest
+ sw_config=$sw_config
--with-perl-lib-install-dir=$prefix/perl.lib
+ sw_config=$sw_config
--with-perl-arch-install-dir=$prefix/perl.arch
;;
samba_3*)
sw_config=$config --enable-socket-wrapper
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 9c3d6e3 Revert Add --without-gettext to restore Samba build on hpisgr8 via 5cdf707 Revert Add --without-gettext to restore Samba build on SerNET-Tru64 via 454aa72 Revert Add --without-gettext to restore Samba build on SerNet-IRIX from adce933 sernet-imini: remove gettext hack again http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 9c3d6e37243297ff0d54a83f33a5a406cb942e8d Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:50:13 2014 +0100 Revert Add --without-gettext to restore Samba build on hpisgr8 This reverts commit 43b5c253e71bb83362c89942017b46ec53af. commit 5cdf70784fd8bff43e3bc2bf236219adb9b29272 Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:47:58 2014 +0100 Revert Add --without-gettext to restore Samba build on SerNET-Tru64 This reverts commit c90aa48f0112f4c40f00357c1dc96e463004c5e7. commit 454aa729d7a1a5b2f06b345a1dafde34763df7e9 Author: Christian Ambach a...@samba.org Date: Fri Jan 3 06:44:22 2014 +0100 Revert Add --without-gettext to restore Samba build on SerNet-IRIX This reverts commit e037a38d69bf7dd6e6d23600438ec2cf2a501f33. --- Summary of changes: SerNet-IRIX.fns |4 SerNet-Tru64.fns |2 +- hpisgr8.fns |2 +- 3 files changed, 2 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns index c845470..cdcb6cb 100644 --- a/SerNet-IRIX.fns +++ b/SerNet-IRIX.fns @@ -15,11 +15,7 @@ for compiler in $compilers; do #export config=--with-included-popt . common.fns - config=--without-gettext - export config test_tree samba_4_0_test . $compiler - config= - export config test_tree samba_3_current source3 $compiler test_tree samba_3_next source3 $compiler diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index b2a995f..3571b60 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -16,7 +16,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext --without-acl-support + config=--without-acl-support export config test_tree samba_4_0_test . $compiler config= diff --git a/hpisgr8.fns b/hpisgr8.fns index c2fcab4..2ba4864 100644 --- a/hpisgr8.fns +++ b/hpisgr8.fns @@ -15,7 +15,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext --without-acl-support + config=--without-acl-support export config test_tree samba_4_0_test . $compiler config= -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 90b2a36 mark tdb2 as an old tree to delete
via 605038a Replace tdb2 build with ntdb
from 9c3d6e3 Revert Add --without-gettext to restore Samba build on
hpisgr8
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 90b2a36f8fbe95203d7793e072a4d0115b920481
Author: Andrew Bartlett abart...@samba.org
Date: Thu Jan 23 20:46:20 2014 +1300
mark tdb2 as an old tree to delete
Signed-off-by: Andrew Bartlett abart...@samba.org
commit 605038a8d28f69273677ca05b2f4bfafab616581
Author: Amitay Isaacs ami...@gmail.com
Date: Thu Jan 23 17:32:09 2014 +1100
Replace tdb2 build with ntdb
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
build_test.fns | 10 +-
common.fns |2 +-
web/trees.conf |4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index de2023e..1f00620 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -164,7 +164,7 @@ choose_scm() {
tree=$1
case $tree in
- samba* | rsync | libreplace | talloc | tdb* | ldb |
pidl | ccache* | waf*)
+ samba* | rsync | libreplace | talloc | tdb | ntdb | ldb
| pidl | ccache* | waf*)
echo git
return 0
;;
@@ -255,7 +255,7 @@ do_make() {
MMTIME=$MAXTIME
# some trees don't need as much time
case $tree in
- rsync | tdb* | talloc | libreplace | ccache* | waf*)
+ rsync | tdb | ntdb | talloc | libreplace | ccache* | waf*)
if [ $compiler != checker ]; then
MMTIME=`expr $MMTIME / 5`
fi
@@ -320,7 +320,7 @@ action_lcovreport() {
lorikeet-heimdal*)
lcov --directory $builddir --capture --output-file
$builddir/$tree.lcov.info
;;
- samba_4*|tdb*|talloc|ldb|libreplace)
+ samba_4*|tdb|ntdb|talloc|ldb|libreplace)
lcov --base-directory $builddir/bin --directory
$builddir/bin --capture --output-file $builddir/$tree.lcov.info
;;
waf)
@@ -343,7 +343,7 @@ action_lcovreport() {
action_callcatcherreport() {
if [ $CALLCATCHER_REPORT = yes ]; then
case $tree in
- tdb*|talloc|ldb)
+ tdb|ntdb|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
;;
samba_4*)
@@ -1046,7 +1046,7 @@ per_run_hook() {
old_trees=web popt distcc samba-gtk smb-build lorikeet-heimdal
samba_3_2
old_trees=$old_tree samba_3_2_test samba4 samba_4_0_waf
samba_4_0_waf.metze
- old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master
+ old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master tdb2
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/common.fns b/common.fns
index c25abf2..e983b39 100644
--- a/common.fns
+++ b/common.fns
@@ -10,6 +10,6 @@ test_tree ccache . $compiler
test_tree ccache-maint . $compiler
test_tree talloc . $compiler
test_tree tdb . $compiler
-test_tree tdb2 . $compiler
+test_tree ntdb . $compiler
test_tree ldb . $compiler
test_tree waf demos $compiler
diff --git a/web/trees.conf b/web/trees.conf
index 5be6cb8..184fcb6 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -54,11 +54,11 @@ repo = samba.git
branch = master
subdir = lib/tdb/
-[tdb2]
+[ntdb]
scm = git
repo = samba.git
branch = master
-subdir = lib/tdb2/
+subdir = lib/ntdb/
[ldb]
scm = git
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via adce933 sernet-imini: remove gettext hack again from fe90d6b bump dead host time to 3 weeks http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit adce933b64b9db16595935bd22a39f1616b3d95f Author: Björn Jacke b...@sernet.de Date: Mon Jan 20 15:29:32 2014 +0100 sernet-imini: remove gettext hack again the gettext detection bug should be fixed now. --- Summary of changes: SerNet-imini.fns |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-imini.fns b/SerNet-imini.fns index 016cc61..91c958f 100644 --- a/SerNet-imini.fns +++ b/SerNet-imini.fns @@ -8,7 +8,7 @@ for compiler in $compilers; do . common.fns - export config=--without-acl-support --without-gettext + export config=--without-acl-support test_tree samba_4_0_test . $compiler export config= -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via fe90d6b bump dead host time to 3 weeks via e47d327 two more hosts missing ACL support from 43b5c25 Add --without-gettext to restore Samba build on hpisgr8 http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit fe90d6be7bd58b118010992f83699df6f82a723d Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 8 18:23:47 2014 +1300 bump dead host time to 3 weeks commit e47d3277ed3faf0a00ff02c0f40fff84273d9462 Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 8 18:22:57 2014 +1300 two more hosts missing ACL support --- Summary of changes: SerNet-Tru64.fns |2 +- hpisgr8.fns|2 +- mail-dead-hosts.py |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index 4420604..b2a995f 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -16,7 +16,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext + config=--without-gettext --without-acl-support export config test_tree samba_4_0_test . $compiler config= diff --git a/hpisgr8.fns b/hpisgr8.fns index 26f2458..c2fcab4 100644 --- a/hpisgr8.fns +++ b/hpisgr8.fns @@ -15,7 +15,7 @@ for compiler in $compilers; do . common.fns - config=--without-gettext + config=--without-gettext --without-acl-support export config test_tree samba_4_0_test . $compiler config= diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py index fada47e..56ca811 100755 --- a/mail-dead-hosts.py +++ b/mail-dead-hosts.py @@ -33,7 +33,7 @@ buildfarm = BuildFarm(timeout=40.0) smtp = smtplib.SMTP() smtp.connect() -hosts = buildfarm.hostdb.dead_hosts(7 * 86400) +hosts = buildfarm.hostdb.dead_hosts(21 * 86400) for host in hosts: if host.last_update: last_update = time.strftime(%a %b %e %H:%M:%S %Y, time.gmtime(host.last_update)) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 43b5c25 Add --without-gettext to restore Samba build on hpisgr8 via c90aa48 Add --without-gettext to restore Samba build on SerNET-Tru64 via e037a38 Add --without-gettext to restore Samba build on SerNet-IRIX via 404b035 add .fns files to work around missing ACL support and missing gettext on macos 10.6 via 5c93542 add .fns files to work around missing ACL support via c1e7965 remove .fns file for removed host sunX via 561b560 remove .fns file for removed host snab via d01f4eb remove .fns file for removed host SerNet-aix via bc1a9ff remove .fns file for removed host samba-klop via 3a207b2 remove .fns file for removed host qnx18 via 2f20f02 remove .fns file for removed host m104 via ea33a4b remove .fns file for removed host gwen via b991646 remove .fns file for removed host gollum via dd3f590 remove .fns file for removed host fjall via 92f6d36 remove .fns file for removed host charis via ae9443b remove .fns file for removed host burns via 8a6f00c remove .fns file for removed host buildsamba02 via 5deb0c1 remove all references to samba_3_master and mark as a removed tree from 13df6dc use https for extermal and protocol indepentent links for ourself http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 43b5c253e71bb83362c89942017b46ec53af Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 14:46:42 2014 +1300 Add --without-gettext to restore Samba build on hpisgr8 commit c90aa48f0112f4c40f00357c1dc96e463004c5e7 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 14:43:45 2014 +1300 Add --without-gettext to restore Samba build on SerNET-Tru64 commit e037a38d69bf7dd6e6d23600438ec2cf2a501f33 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 14:40:39 2014 +1300 Add --without-gettext to restore Samba build on SerNet-IRIX commit 404b035f28b6ab9fdf4edc5b4deca2885f71c7c8 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 14:31:55 2014 +1300 add .fns files to work around missing ACL support and missing gettext on macos 10.6 commit 5c935426bd0c5007ea0e523c1db3be449ecb0b6f Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 14:28:21 2014 +1300 add .fns files to work around missing ACL support commit c1e79654493fa9ab03f0e31085c641b4e62bc2d7 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:51:40 2014 +1300 remove .fns file for removed host sunX commit 561b560df38027a7c9b87a6b690f604798948138 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:51:27 2014 +1300 remove .fns file for removed host snab commit d01f4eb203ad28a27ddc6230cbbc865d7adff5b4 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:50:51 2014 +1300 remove .fns file for removed host SerNet-aix commit bc1a9ff015f58bdb082080c69b5d115339ba19a2 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:50:31 2014 +1300 remove .fns file for removed host samba-klop commit 3a207b27f9ca28cb53b8a6d75dc82f401796f837 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:50:07 2014 +1300 remove .fns file for removed host qnx18 commit 2f20f029f10897b4ecf0c68483f1b4790af2187a Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:49:53 2014 +1300 remove .fns file for removed host m104 commit ea33a4b55a557c3fb481ffb0d09cda3f82b86755 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:49:32 2014 +1300 remove .fns file for removed host gwen commit b99164612a9e858515975e6e4d2523d88ad37f79 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:49:02 2014 +1300 remove .fns file for removed host gollum commit dd3f590dd0085e021bed2fed94de32258ef59af7 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:48:01 2014 +1300 remove .fns file for removed host fjall commit 92f6d367df0f5a3ed3338f1aaeb4ac8bb1cd49e7 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:47:42 2014 +1300 remove .fns file for removed host charis commit ae9443b8eace9858033247ebe99349883293cd23 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:47:05 2014 +1300 remove .fns file for removed host burns commit 8a6f00c67c4719515f7b88fa95fee56d71f2bb45 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:46:54 2014 +1300 remove .fns file for removed host buildsamba02 commit 5deb0c12b8667d057bb329eac4d9ead5aa73c5d8 Author: Andrew Bartlett abart...@samba.org Date: Tue Jan 7 13:44:54 2014 +1300 remove all references to samba_3_master and mark as a removed tree --- Summary of changes: SerNet-IRIX.fns|5 +- gwen.fns = SerNet-NetBSD5.fns |7 +- SerNet-Tru64.fns
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 13df6dc use https for extermal and protocol indepentent links for ourself from c13ed96 Fix encoding when updating platform. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 13df6dca7663fe0a3966a96a7799f62dc3030844 Author: Björn Jacke b...@sernet.de Date: Mon Dec 30 14:07:59 2013 +0100 use https for extermal and protocol indepentent links for ourself --- Summary of changes: buildfarm/web/__init__.py |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index b7f0194..08d577a 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -54,7 +54,7 @@ import time import wsgiref.util webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., web)) -GITWEB_BASE = http://gitweb.samba.org; +GITWEB_BASE = https://gitweb.samba.org; HISTORY_HORIZON = 1000 # this is automatically filled in @@ -533,7 +533,7 @@ class ViewBuildPage(BuildFarmPage): yield h2Build log:/h2\n yield print_log_pretty(log) -yield psmallSome of the above icons derived from the a href='http://www.gnome.org'Gnome Project/a's stock icons./small/p +yield psmallSome of the above icons derived from the a href='https://www.gnome.org'Gnome Project/a's stock icons./small/p yield /div else: yield pSwitch to the a href='%s?function=View+Build;host=%s;tree=%s;\ @@ -954,8 +954,8 @@ class BuildFarmApp(object): yield meta name='description' contents='Home of the Samba Build Farm, the automated testing facility.'/\n yield meta name='robots' contents='noindex'/ yield link rel='stylesheet' href='/build_farm.css' type='text/css' media='all'/ -yield link rel='stylesheet' href='http://www.samba.org/samba/style/common.css' type='text/css' media='all'/ -yield link rel='shortcut icon' href='http://www.samba.org/samba/images/favicon.ico'/ +yield link rel='stylesheet' href='//www.samba.org/samba/style/common.css' type='text/css' media='all'/ +yield link rel='shortcut icon' href='//www.samba.org/samba/images/favicon.ico'/ yield /head yield body -- build.samba.org
Re: [SCM] build.samba.org - branch master updated
On Mon, Dec 30, 2013 at 02:09:05PM +0100, Björn Jacke wrote: The branch, master has been updated via 13df6dc use https for extermal and protocol indepentent links for ourself from c13ed96 Fix encoding when updating platform. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 13df6dca7663fe0a3966a96a7799f62dc3030844 Author: Björn Jacke b...@sernet.de Date: Mon Dec 30 14:07:59 2013 +0100 use https for extermal and protocol indepentent links for ourself Can we also turn on Perfect Forward Secrecy if we haven't already done so (sorry, not a TLS expert myself) ? http://en.wikipedia.org/wiki/Forward_secrecy Jeremy.
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via c13ed96 Fix encoding when updating platform.
from 8976254 build: Fix build farm for hosts other than our coverage test
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit c13ed9660cec49958b97efccdb751f23044e6eed
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Sep 24 20:46:07 2012 +0200
Fix encoding when updating platform.
---
Summary of changes:
admin.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/admin.py b/admin.py
index 60679f8..b78fb32 100755
--- a/admin.py
+++ b/admin.py
@@ -89,7 +89,7 @@ elif op == modify:
mod_op = platform
if mod_op == platform:
platform = raw_input(Enter new platform: )
-host.update_platform(platform)
+host.update_platform(platform.decode('utf-8'))
buildfarm.commit()
elif mod_op == owner:
owner = raw_input(Enter new owner's name: )
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 8976254 build: Fix build farm for hosts other than our coverage test
from 178df90 Add action_none to assist hosts with no extra_actions
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 89762541cf479b8656040daf78127255b529c4d7
Author: Andrew Bartlett abart...@samba.org
Date: Tue Sep 4 09:56:38 2012 +1000
build: Fix build farm for hosts other than our coverage test
---
Summary of changes:
build_test.fns |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 3b0a4b8..ded4d09 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -814,7 +814,7 @@ test_tree() {
fi
if [ $extra_actions = ]; then
- actions=none
+ extra_actions=none
fi
# start the build
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 52601dd double the number of possible open files
from 5a76ae9 move pidl build into the compiler loop
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 52601dd6844a450c51ca0862e341e7e71d7e6ec0
Author: Andrew Bartlett abart...@samba.org
Date: Sat Sep 1 19:34:18 2012 +1000
double the number of possible open files
With all the test environments we need a few more files. This new
limit is a guess however.
Andrew Bartlett
---
Summary of changes:
build_test.fns | 61 ---
1 files changed, 57 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index ff5078c..400b802 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -610,9 +610,9 @@ test_tree() {
# darn, this affects sparse files too! disable it
# ulimit -f 10 2 /dev/null
- # try and limit the number of open files to 250. That means we'll
discover
- # fd leaks faster
- ulimit -n 250 2 /dev/null
+ # try and limit the number of open files to 500, up from 250. That
means we'll discover
+ # fd leaks faster while allowing our very complex make test to run
+ ulimit -n 500 2 /dev/null
# Keep stuff private
umask 077
@@ -799,9 +799,14 @@ test_tree() {
#Action == what to do ie. configure config_log ...
actions=$*
+ extra_actions=$EXTRA_ACTIONS
if [ $actions = ]; then
- actions=configure config_log config_header build install test
$EXTRA_ACTIONS
+ actions=configure config_log config_header build install test
+ fi
+
+ if [ $extra_actions = ]; then
+ actions=none
fi
# start the build
@@ -909,6 +914,54 @@ test_tree() {
fi
done
+ for action in $extra_actions; do
+ if [ x$action = x ]; then
+ break;
+ fi
+
+ echo Running action $action
+
+ date
+
+ cd $builddir || exit 1
+ export srcdir
+ df .
+ mount
+ vmstat
+
+ if [ x$PREHOOKS != x ]; then
+ for hooks in $PREHOOKS; do
+ if [ x$hooks = x$action ]; then
+ ( prehook_$action )
+ fi
+ done
+ fi
+
+ ( action_$action )
+ action_status=$?
+
+ if [ x$POSTHOOKS != x ]; then
+ for hooks in $POSTHOOKS; do
+ if [ x$hooks = x$action ]; then
+ ( posthook_$action )
+ fi
+ done
+ fi
+
+ df .
+
+ if [ $action_status != 0 ]; then
+ echo ACTION FAILED: $action;
+ echo return code $action_status $action;
+ else
+ echo ACTION PASSED: $action;
+ fi
+
+ if [ $action_status != 0 ]; then
+ break;
+ fi
+ done
+
if [ $noclean = yes ]; then
echo cleanup skipped!
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 178df90 Add action_none to assist hosts with no extra_actions
from 52601dd double the number of possible open files
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 178df903c098abc262c2a412d8e5c22957c14b42
Author: Andrew Bartlett abart...@samba.org
Date: Sun Sep 2 10:21:59 2012 +1000
Add action_none to assist hosts with no extra_actions
The previous commit added a handler for extra_actions that are not tied to
the success
of the previous actions (allowing lcov and callcatcher to run even on
failed tests).
This was missing an action_none for all the other hosts.
Andrew Bartlett
---
Summary of changes:
build_test.fns |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 400b802..3b0a4b8 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -579,6 +579,14 @@ action_test() {
esac
}
+#
+# Do nothing (needed if we have nothing to do for extra_actions)
+#
+
+action_none() {
+return 0;
+}
+
###
# do a test build of a particular tree
# This is the master function called by generic.fns or
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 5a76ae9 move pidl build into the compiler loop from b7bc145 Use --enable-selftest only on master http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 5a76ae967439025bb40499339d0a77af7c785388 Author: Björn Jacke b...@sernet.de Date: Wed Aug 29 13:01:39 2012 +0200 move pidl build into the compiler loop --- Summary of changes: generic.fns | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/generic.fns b/generic.fns index 25a6b2e..46f552a 100644 --- a/generic.fns +++ b/generic.fns @@ -73,11 +73,12 @@ for compiler in $compilers; do fi fi fi -done -# only attempt pidl if we have perl -if which perl /dev/null; then - test_tree pidl . cc -fi + # only attempt pidl if we have perl + if which perl /dev/null; then +test_tree pidl . cc + fi + +done global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via b7bc145 Use --enable-selftest only on master
from dd6b02d build samba_3 with --enable-selftest
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit b7bc1451ced1ec73ac3eca4dda03e036f6b79e2a
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 21 23:39:16 2012 +1000
Use --enable-selftest only on master
---
Summary of changes:
build_test.fns |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 46ebc37..ff5078c 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -748,9 +748,13 @@ test_tree() {
samba_4*)
sw_config=$config --enable-selftest
;;
- samba_3*)
+ samba_3_master)
sw_config=$config --enable-selftest
;;
+ samba_3*)
+ sw_config=$config --enable-socket-wrapper
+ sw_config=$sw_config --enable-nss-wrapper
+ ;;
samba-gtk)
PKG_CONFIG_PATH=$test_root/prefix/samba_4_0_test.$compiler/lib/pkgconfig
export PKG_CONFIG_PATH
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via c0b97eb build samba_4 with --enable-selftest
from 9a03d5b use killall on hape after a build run to do what
killbysubdir should do
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit c0b97eb9640dfbc3a01fc3fb1f00cac58def53f3
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 21 07:55:48 2012 +1000
build samba_4 with --enable-selftest
This turns on all the required selftest stuff, rather than specifying it
one-by-one.
Andrew Bartlett
---
Summary of changes:
build_test.fns |4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 2358524..44a87f6 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -746,9 +746,7 @@ test_tree() {
sw_config=$config --enable-socket-wrapper
;;
samba_4*)
- sw_config=$config --enable-socket-wrapper
- sw_config=$sw_config --enable-nss-wrapper
- sw_config=$sw_config --enable-uid-wrapper
+ sw_config=$config --enable-selftest
;;
samba_3*)
sw_config=$config --enable-socket-wrapper
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via dd6b02d build samba_3 with --enable-selftest
from c0b97eb build samba_4 with --enable-selftest
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit dd6b02d814b4c38ccec1edc3b7732f2284d8f542
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 21 12:54:46 2012 +1000
build samba_3 with --enable-selftest
This turns on all the required selftest stuff, rather than specifying it
one-by-one.
Andrew Bartlett
---
Summary of changes:
build_test.fns |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 44a87f6..46ebc37 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -749,8 +749,7 @@ test_tree() {
sw_config=$config --enable-selftest
;;
samba_3*)
- sw_config=$config --enable-socket-wrapper
- sw_config=$sw_config --enable-nss-wrapper
+ sw_config=$config --enable-selftest
;;
samba-gtk)
PKG_CONFIG_PATH=$test_root/prefix/samba_4_0_test.$compiler/lib/pkgconfig
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 9a03d5b use killall on hape after a build run to do what killbysubdir should do from 54b3bb4 use generic.fns in SerNet-Tru64.fns http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 9a03d5b95a3c0faeca9f3a7084e4cc78ff71 Author: Björn Jacke b...@sernet.de Date: Fri Jun 29 11:57:32 2012 +0200 use killall on hape after a build run to do what killbysubdir should do --- Summary of changes: hape.fns |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/hape.fns b/hape.fns index cd29962..eda75d6 100644 --- a/hape.fns +++ b/hape.fns @@ -31,3 +31,7 @@ for compiler in gcc ; do done global_unlock +# as long as killbysubdir doesn't work on HP-UX, let's killall our build user's +# processes: +cd / ; killall + -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 54b3bb4 use generic.fns in SerNet-Tru64.fns from e2c11a0 SerNet-aix.fns: use killall after a complete run to do what killbysubdir should have done http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 54b3bb43abd4791880d68a4a39ccb0a25e1682b9 Author: Björn Jacke b...@sernet.de Date: Wed Jun 27 18:41:25 2012 +0200 use generic.fns in SerNet-Tru64.fns --- Summary of changes: SerNet-Tru64.fns | 25 + 1 files changed, 1 insertions(+), 24 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index 8622412..b9c093d 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -1,6 +1,3 @@ -per_run_hook - -global_lock compilers=cc MAXTIME=18000 @@ -11,24 +8,4 @@ export MAXTIME SMBD_MAXTIME SAMBA_MAXTIME CFLAGS=-g $CFLAGS export CFLAGS -for compiler in $compilers; do - - . common.fns - TDB_NO_FSYNC=1 - SAVED_CPPFLAGS=$CPPFLAGS - CPPFLAGS= - export TDB_NO_FSYNC - export CPPFLAGS - test_tree samba_4_0_test . $compiler - CPPFLAGS=$SAVED_CPPFLAGS - export CPPFLAGS - - test_tree samba_3_current source3 $compiler - test_tree samba_3_next source3 $compiler - test_tree samba_3_master source3 $compiler - TDB_NO_FSYNC=0 - export TDB_NO_FSYNC - -done - -global_unlock +. generic.fns -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via e2c11a0 SerNet-aix.fns: use killall after a complete run to do what killbysubdir should have done from 5cef92d host opi is gone http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit e2c11a0b48cf03d3864b42a4e8ddfdd376f5c1cd Author: Björn Jacke b...@sernet.de Date: Fri Jun 22 14:28:32 2012 +0200 SerNet-aix.fns: use killall after a complete run to do what killbysubdir should have done --- Summary of changes: SerNet-aix.fns |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-aix.fns b/SerNet-aix.fns index c06515d..8200976 100644 --- a/SerNet-aix.fns +++ b/SerNet-aix.fns @@ -20,3 +20,7 @@ compiler=xlc_r test_tree samba_4_0_test . $compiler global_unlock + +# as long as killbysubdir doesn't work on AIX, let's killall our build user's +# background processes: +killall - -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 5cef92d host opi is gone from 38aa76b Revert test for fixing heimdal build on aix http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 5cef92d8580f3e7186289753c513ff31ca6b4272 Author: Stefan Metzmacher me...@samba.org Date: Tue Jun 19 00:07:33 2012 +0200 host opi is gone metze --- Summary of changes: opi.fns | 23 --- 1 files changed, 0 insertions(+), 23 deletions(-) delete mode 100644 opi.fns Changeset truncated at 500 lines: diff --git a/opi.fns b/opi.fns deleted file mode 100644 index 2c10d0d..000 --- a/opi.fns +++ /dev/null @@ -1,23 +0,0 @@ -per_run_hook - -global_lock - -compiler=gcc -CFLAGS=-O3 -Wall -export CFLAGS - -. common.fns -#test_tree lorikeet-heimdal . $compiler - -export config=--with-selftest-prefix=/data/bf/st.samba_4_0_test -test_tree samba_4_0_test . $compiler -export config= - -test_tree samba_3_current source3 $compiler -test_tree samba_3_next source3 $compiler -export config=--enable-developer -test_tree samba_3_master source3 $compiler -export config= -test_tree pidl . $compiler build test - -global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 38aa76b Revert test for fixing heimdal build on aix
from c2dd325 test that build farm locks are 0 size
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 38aa76ba94c5755950f9b6a77d9db1118e96ef03
Author: Björn Jacke b...@sernet.de
Date: Mon Jun 18 23:50:17 2012 +0200
Revert test for fixing heimdal build on aix
This reverts commit 8703cf4ba3ac33d7a4d497c46c3e507c9593ea78.
---
Summary of changes:
SerNet-aix.fns | 13 -
1 files changed, 0 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index 825a42a..c06515d 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -6,19 +6,6 @@ global_lock
PATH=/opt/home/tridge/python/bin:$PATH
export PATH
-PREHOOKS=configure
-
-prehook_configure()
-{
-case $tree in
-samba_4*)
- (cd ${builddir}/..; gpatch -p 1 $HOME/patch_aix)
-;;
-*)
-;;
-esac
-}
-
compiler=cc
. common.fns
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via c2dd325 test that build farm locks are 0 size
from d405260 Add an easy way to got back to the error list
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit c2dd3258882427afeaf3e1f7eb59bc13d30441e7
Author: Andrew Bartlett abart...@samba.org
Date: Thu May 17 11:56:35 2012 +1000
test that build farm locks are 0 size
This does make the locks less atomic, but disk full situations are more
common.
When the disk fills up, then the zero length file is created, and the host
drops out of the build farm.
Andrew Bartlett
---
Summary of changes:
build_test.fns |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 392180a..2358524 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -196,7 +196,9 @@ lock_file() {
return 0
fi
- if test -f $lckf; then
+ # We need to assert that the file is 0 size, as otherwise we
never
+# recover from disk full situations
+ if test -f $lckf test -s $lckf; then
test x$machine = x$host || {
echo lock file $lckf is valid for other
machine $machine
return 1
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 7a1ca19 Hide pretest information by default
from 285b0e1 Add some spacing before the status (failed, skipped, ...)
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 7a1ca19d62065d21d84d4c4cdae10412dbb03540
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:06:28 2012 -0700
Hide pretest information by default
---
Summary of changes:
web/build_farm.css |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/web/build_farm.css b/web/build_farm.css
index 9b472f4..a82263d 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -18,6 +18,7 @@
color: rgb(0, 0, 0);
font-family: monospace;
}
+#log .output .pretest { display: none;}
#log div.unit {
margin: 5px;
padding: 10px;
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 725eebc Really fix the display of pretests infos
from 7a1ca19 Hide pretest information by default
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 725eebc8e5d2364749a6614bc0652c262513a980
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:23:17 2012 -0700
Really fix the display of pretests infos
---
Summary of changes:
web/build_farm.css |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/web/build_farm.css b/web/build_farm.css
index a82263d..b6321b8 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -32,9 +32,11 @@
#log div.unit.uxpassed { background-color: rgb(255, 180, 180); }
#log div.unit.error { background-color: rgb(255, 180, 180); }
#log div.unit.mistake {background-color: rgb(180, 180, 255); }
+#log div.unit.pretest.ok { background-color: rgb(180, 255, 180); }
#log .unit.failed .output { display: block;}
#log .unit.skipped .output { display: block;}
+#log .unit.skipped .output { display: block;}
#log .unit.passed .output { display: none;}
#log .unit.error .output { display: none;}
#log .unit.mistake .output { display: none;}
@@ -42,6 +44,7 @@
#log .unit.xfailed .output { display: none;}
#log .unit.uxpassed .output { display: none;}
#log .unit.errorlog .output { display: none;}
+#log .unit.pretest .output { display: none;}
#log div.status.errorlog { display: none;}
img + div.action.title {margin-left: 0.5em;}
a + div.action.status {margin-left: 0.5em;}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 802e02a remove extra margin between unit test box results
via d8fc484 Add a list of shortcut to failed tests
from 725eebc Really fix the display of pretests infos
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 802e02a5ab2470629c84034500c85eb080a2dca0
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:34:26 2012 -0700
remove extra margin between unit test box results
commit d8fc4842302ebaefd6fe5f508c32c734e3c1486d
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:33:44 2012 -0700
Add a list of shortcut to failed tests
---
Summary of changes:
buildfarm/web/__init__.py | 19 ++-
web/build_farm.css|5 +++--
2 files changed, 21 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 1e88020..95671e7 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -203,6 +203,10 @@ class LogPrettyPrinter(object):
self.indice += 1
return .join(make_collapsible_html('test', m.group(1), '',
self.indice, 'skipped'))
+def _format_pretestsuite(self, m):
+self.indice += 1
+return m.group(1)+.join(make_collapsible_html('pretest', 'Pretest
infos', m.group(2), self.indice, 'ok'))+\n+m.group(3)
+
def _format_testsuite(self, m):
testName = m.group(1)
content = m.group(2)
@@ -212,6 +216,8 @@ class LogPrettyPrinter(object):
else:
errorReason =
self.indice += 1
+if m.group(3) in (error, failure):
+self.test_links.append([testName, 'lnk-test-%d' %self.indice])
return .join(make_collapsible_html('test', testName,
content+errorReason, self.indice, status))
def _format_test(self, m):
@@ -222,6 +228,7 @@ class LogPrettyPrinter(object):
# do some pretty printing for the actions
pattern = re.compile((Running
action\s+([\w\-]+)$(?:\s^.*$)*?\sACTION\ (PASSED|FAILED):\ ([\w\-]+)$), re.M)
log = pattern.sub(self._pretty_print, log)
+buf =
log = re.sub(
--==--==--==--==--==--==--==--==--==--==--.*?
@@ -233,9 +240,13 @@ class LogPrettyPrinter(object):
==\s+
, self._format_stage, log)
+pattern = re.compile((Running action
test).*$\s((?:^.*$\s)*?)^((?:skip-)?testsuite: ), re.M)
+log = pattern.sub(self._format_pretestsuite, log)
+
log = re.sub(skip-testsuite: ([\w\-=,_:\ /.; \(\)]+).*?,
self._format_skip_testsuite, log)
+self.test_links = []
pattern = re.compile(^testsuite:
(.+)$\s((?:^.*$\s)*?)testsuite-(\w+): .*?(?:(\[$\s(?:^.*$\s)*?^\]$)|$), re.M)
log = pattern.sub(self._format_testsuite, log)
log = re.sub(
@@ -244,6 +255,12 @@ class LogPrettyPrinter(object):
(success|xfail|failure|skip|uxsuccess): [\w\-=,_:\ /.; \(\)]+(
\[.*?\])?.*?
, self._format_test, log)
+for tst in self.test_links:
+buf = %s\nA href='#%s'%s/A % (buf, tst[1], tst[0])
+
+if not buf == :
+divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', buf, self.indice, ))
+log = re.sub(Running action\s+test, divhtml, log)
return pre%s/pre % log
@@ -325,7 +342,7 @@ def make_collapsible_html(type, title, output, id,
status=):
# note that we may be inside a pre, so we don't put any extra whitespace
# in this html
yield div class='%s unit %s' id='%s-%s' % (type, status, type, id)
-yield a href=\javascript:handle('%s');\ % id
+yield a name='lnk-%s-%s' href=\javascript:handle('%s');\ % (type,
id, id)
yield img id='img-%s' name='img-%s' alt='%s' src='%s' / % (id, id,
status, icon)
yield div class='%s title'%s/div/a % (type, title)
yield div class='%s status %s'%s/div % (type, status, status)
diff --git a/web/build_farm.css b/web/build_farm.css
index b6321b8..6b8fb01 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -18,9 +18,10 @@
color: rgb(0, 0, 0);
font-family: monospace;
}
-#log .output .pretest { display: none;}
#log div.unit {
- margin: 5px;
+ /* We have already a margin that is implied by the \n in the HTML
+* no need to remargin
+* margin: 5px;*/
padding: 10px;
border: 2px solid black;
}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 52ca7ac Make display of shortcut box nicer
from 802e02a remove extra margin between unit test box results
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 52ca7ac82de260e8682ce4c0dadf73a58dabe7f4
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:36:06 2012 -0700
Make display of shortcut box nicer
---
Summary of changes:
buildfarm/web/__init__.py |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 95671e7..ca2c242 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -259,6 +259,7 @@ class LogPrettyPrinter(object):
buf = %s\nA href='#%s'%s/A % (buf, tst[1], tst[0])
if not buf == :
+buf = %s\n % buf
divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', buf, self.indice, ))
log = re.sub(Running action\s+test, divhtml, log)
return pre%s/pre % log
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 0e79461 Make display of shortcut box nicer
from 52ca7ac Make display of shortcut box nicer
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 0e794613d5d2e44b4f308643fab5fda91eaed5a5
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 00:38:16 2012 -0700
Make display of shortcut box nicer
---
Summary of changes:
buildfarm/web/__init__.py |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index ca2c242..69639dd 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -259,8 +259,7 @@ class LogPrettyPrinter(object):
buf = %s\nA href='#%s'%s/A % (buf, tst[1], tst[0])
if not buf == :
-buf = %s\n % buf
-divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', buf, self.indice, ))
+divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', buf, self.indice, ))+\n
log = re.sub(Running action\s+test, divhtml, log)
return pre%s/pre % log
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via d405260 Add an easy way to got back to the error list
via 6ff3c9e Update my copyright
from 0e79461 Make display of shortcut box nicer
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit d4052603f2ca2e6f198cf155760a6685166948b4
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 01:01:41 2012 -0700
Add an easy way to got back to the error list
commit 6ff3c9e54a5a6ddd94b80194c30a7c72fcf0aff6
Author: Matthieu Patou m...@matws.net
Date: Thu Mar 15 01:01:15 2012 -0700
Update my copyright
---
Summary of changes:
buildfarm/web/__init__.py |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 69639dd..b7f0194 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -2,7 +2,7 @@
# This CGI script presents the results of the build_farm build
# Copyright (C) Jelmer Vernooij jel...@samba.org 2010
-# Copyright (C) Matthieu Patou m...@matws.net 2010
+# Copyright (C) Matthieu Patou m...@matws.net 2010-2012
#
# Based on the original web/build.pl:
#
@@ -216,9 +216,11 @@ class LogPrettyPrinter(object):
else:
errorReason =
self.indice += 1
+backlink =
if m.group(3) in (error, failure):
self.test_links.append([testName, 'lnk-test-%d' %self.indice])
-return .join(make_collapsible_html('test', testName,
content+errorReason, self.indice, status))
+backlink = pa href='#shortcut2errors'back to error list/a
+return .join(make_collapsible_html('test', testName,
content+errorReason+backlink, self.indice, status))
def _format_test(self, m):
self.indice += 1
@@ -259,7 +261,7 @@ class LogPrettyPrinter(object):
buf = %s\nA href='#%s'%s/A % (buf, tst[1], tst[0])
if not buf == :
-divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', buf, self.indice, ))+\n
+divhtml = .join(make_collapsible_html('testlinks', 'Shortcut to
failed tests', a name='shortcut2errors'/a%s % buf, self.indice, ))+\n
log = re.sub(Running action\s+test, divhtml, log)
return pre%s/pre % log
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 963df5e Limit list of older build to 10 by default
from a5112ec Print 404 page if build is not found.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 963df5e7da8a9215c63e795a437b03e5bb474733
Author: Matthieu Patou m...@matws.net
Date: Wed Mar 14 21:22:24 2012 -0700
Limit list of older build to 10 by default
---
Summary of changes:
buildfarm/web/__init__.py | 25 -
1 files changed, 20 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index f6444dc..1e88020 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -385,8 +385,10 @@ class BuildFarmPage(object):
class ViewBuildPage(BuildFarmPage):
-def show_oldrevs(self, myself, tree, host, compiler):
+def show_oldrevs(self, myself, build, host, compiler, limit):
show the available old revisions, if any
+
+tree = build.tree
old_builds = self.buildfarm.builds.get_old_builds(tree, host, compiler)
if not old_builds:
@@ -398,7 +400,11 @@ class ViewBuildPage(BuildFarmPage):
yield
theadtrthRevision/ththStatus/ththAge/th/tr/thead\n
yield tbody\n
+nb = 0
for old_build in old_builds:
+if limit = 0 and nb = limit:
+break
+nb = nb + 1
yield trtd%s/tdtd%s/tdtd%s/td/tr\n % (
revision_link(myself, old_build.revision, tree),
build_link(myself, old_build),
@@ -406,7 +412,9 @@ class ViewBuildPage(BuildFarmPage):
yield /tbody/table\n
-def render(self, myself, build, plain_logs=False):
+yield pa href='%s/limit/-1'Show all previous build list/a\n %
(build_uri(myself, build))
+
+def render(self, myself, build, plain_logs=False, limit=10):
view one build in detail
uname = None
@@ -464,7 +472,7 @@ class ViewBuildPage(BuildFarmPage):
yield trtdconfigure options:/tdtd%s/td/tr\n % config
yield /table\n
-yield .join(self.show_oldrevs(myself, build.tree, build.host,
build.compiler))
+yield .join(self.show_oldrevs(myself, build, build.host,
build.compiler, limit))
# check the head of the output for our magic string
rev_var =
@@ -1071,10 +1079,17 @@ class BuildFarmApp(object):
import difflib
yield .join(difflib.unified_diff(subunit_other,
subunit_this))
-elif subfn in (, None):
+elif subfn in (, limit, None):
+if subfn == limit:
+try:
+limit = int(wsgiref.util.shift_path_info(environ))
+except:
+limit = 10
+else:
+limit = 10
start_response('200 OK', [
('Content-type', 'text/html; charset=utf-8')])
-yield .join(self.html_page(form, page.render(myself,
build, False)))
+yield .join(self.html_page(form, page.render(myself,
build, False, limit)))
elif fn in (, None):
start_response('200 OK', [
('Content-type', 'text/html; charset=utf-8')])
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 285b0e1 Add some spacing before the status (failed, skipped, ...)
from 963df5e Limit list of older build to 10 by default
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 285b0e1cafbbd134fe359c7432c479ef46fe5ad8
Author: Matthieu Patou m...@matws.net
Date: Wed Mar 14 21:29:35 2012 -0700
Add some spacing before the status (failed, skipped, ...)
---
Summary of changes:
web/build_farm.css |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/web/build_farm.css b/web/build_farm.css
index 136bea3..9b472f4 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -5,6 +5,7 @@
font-weight: bold;
font-family: sans-serif;
}
+#log .status { margin-left: 0.5ex; }
#log .status.failed { color: rgb(153, 0, 0); }
#log .status.passed { color: rgb(0, 153, 0); }
#log .status.skipped { color: rgb(0, 0, 153); }
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via a5112ec Print 404 page if build is not found.
from 87b42eb Add tdb2 build
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit a5112ec54a329d996a9772cdfad5f5357296bfc2
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Mar 10 18:53:43 2012 +0100
Print 404 page if build is not found.
---
Summary of changes:
buildfarm/web/__init__.py |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index c4972dc..f6444dc 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -1030,7 +1030,13 @@ class BuildFarmApp(object):
yield .join(self.html_page(form, page.render_html(myself,
wsgiref.util.shift_path_info(environ
elif fn == build:
build_checksum = wsgiref.util.shift_path_info(environ)
-build = self.buildfarm.builds.get_by_checksum(build_checksum)
+try:
+build =
self.buildfarm.builds.get_by_checksum(build_checksum)
+except NoSuchBuildError:
+start_response('404 Page Not Found', [
+('Content-Type', 'text/html; charset=utf8')])
+yield No build with checksum %s found % build_checksum
+return
page = ViewBuildPage(self.buildfarm)
subfn = wsgiref.util.shift_path_info(environ)
if subfn == +plain:
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 87b42eb Add tdb2 build
from 1174b9f add per_run_hook and global_lock to coverage.fns
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 87b42eba624bdd267c8d3bce3dbb6dbfd941f629
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Mar 7 10:03:34 2012 +1100
Add tdb2 build
---
Summary of changes:
build_test.fns |8
common.fns |1 +
snab.fns |2 +-
web/trees.conf |6 ++
4 files changed, 12 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 50ab43c..392180a 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -164,7 +164,7 @@ choose_scm() {
tree=$1
case $tree in
- samba* | rsync | libreplace | talloc | tdb | ldb | pidl
| ccache* | waf*)
+ samba* | rsync | libreplace | talloc | tdb* | ldb |
pidl | ccache* | waf*)
echo git
return 0
;;
@@ -253,7 +253,7 @@ do_make() {
MMTIME=$MAXTIME
# some trees don't need as much time
case $tree in
- rsync | tdb | talloc | libreplace | ccache* | waf*)
+ rsync | tdb* | talloc | libreplace | ccache* | waf*)
if [ $compiler != checker ]; then
MMTIME=`expr $MMTIME / 5`
fi
@@ -321,7 +321,7 @@ action_lcovreport() {
samba_3_master*)
lcov --base-directory $builddir --directory
$builddir/.. --capture --output-file $builddir/$tree.lcov.info
;;
- samba_4*|tdb|talloc|ldb|libreplace)
+ samba_4*|tdb*|talloc|ldb|libreplace)
lcov --base-directory $builddir/bin --directory
$builddir/bin --capture --output-file $builddir/$tree.lcov.info
;;
waf)
@@ -344,7 +344,7 @@ action_lcovreport() {
action_callcatcherreport() {
if [ $CALLCATCHER_REPORT = yes ]; then
case $tree in
- tdb|talloc|ldb)
+ tdb*|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
;;
samba_3_master|samba_4*)
diff --git a/common.fns b/common.fns
index 87fe12d..c25abf2 100644
--- a/common.fns
+++ b/common.fns
@@ -10,5 +10,6 @@ test_tree ccache . $compiler
test_tree ccache-maint . $compiler
test_tree talloc . $compiler
test_tree tdb . $compiler
+test_tree tdb2 . $compiler
test_tree ldb . $compiler
test_tree waf demos $compiler
diff --git a/snab.fns b/snab.fns
index 204bed6..47ae2d6 100644
--- a/snab.fns
+++ b/snab.fns
@@ -14,7 +14,7 @@ for d in samba_3_current samba_3_next samba_3_master; do
test_tree $d source checker configure config_log config_header build
cc_checker install test
done
-for d in ldb tdb talloc libreplace lorikeet-heimdal ccache rsync; do
+for d in ldb tdb tdb2 talloc libreplace lorikeet-heimdal ccache rsync; do
export CFLAGS=$CHECK_FLAGS --beam::data=/home/tridge/beam/$d
mkdir -p /home/tridge/beam/$d
test_tree $d . checker configure config_log config_header build cc_checker
install test
diff --git a/web/trees.conf b/web/trees.conf
index bfa4c03..a0fa138 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -60,6 +60,12 @@ repo = samba.git
branch = master
subdir = lib/tdb/
+[tdb2]
+scm = git
+repo = samba.git
+branch = master
+subdir = lib/tdb2/
+
[ldb]
scm = git
repo = samba.git
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1174b9f add per_run_hook and global_lock to coverage.fns from 20718bc Never display builds from unknown hosts http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1174b9fa7686201c330476d309e1504adc79e901 Author: Andrew Bartlett abart...@samba.org Date: Sat Feb 25 12:41:37 2012 +1100 add per_run_hook and global_lock to coverage.fns --- Summary of changes: coverage.fns |5 + 1 files changed, 5 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/coverage.fns b/coverage.fns index fd84ea7..0846b23 100644 --- a/coverage.fns +++ b/coverage.fns @@ -1,3 +1,7 @@ +per_run_hook + +global_lock + # We need to disable ccache for the lcov love to work export CCACHE_DISABLE=yes export LCOV_REPORT=yes @@ -15,3 +19,4 @@ test_tree samba_3_current source3 $compiler test_tree samba_3_next source3 $compiler test_tree samba_3_master source3 $compiler +global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 20718bc Never display builds from unknown hosts from f4cf0c5 also return unfiltered callanalyse output http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 20718bc65127e27b5550828bdaf1ec10458302c1 Author: Andrew Bartlett abart...@samba.org Date: Sun Feb 19 13:50:43 2012 +1100 Never display builds from unknown hosts --- Summary of changes: buildfarm/web/__init__.py | 31 +++ 1 files changed, 19 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index eae7ab0..c4972dc 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -533,6 +533,10 @@ class ViewRecentBuildsPage(BuildFarmPage): all_builds = [] def build_platform(build): +host = self.buildfarm.hostdb[build.host] +return host.platform.encode(utf-8) + +def build_platform_safe(build): try: host = self.buildfarm.hostdb[build.host] except hostdb.NoSuchHost: @@ -544,7 +548,7 @@ class ViewRecentBuildsPage(BuildFarmPage): revision: lambda a, b: cmp(a.revision, b.revision), age: lambda a, b: cmp(a.age, b.age), host: lambda a, b: cmp(a.host, b.host), -platform: lambda a, b: cmp(build_platform(a), build_platform(b)), +platform: lambda a, b: cmp(build_platform_safe(a), build_platform_safe(b)), compiler: lambda a, b: cmp(a.compiler, b.compiler), status: lambda a, b: cmp(a.status(), b.status()), } @@ -579,15 +583,19 @@ class ViewRecentBuildsPage(BuildFarmPage): yield tbody for build in all_builds: -yield tr -yield td%s/td % util.dhm_time(build.age) -yield td%s/td % revision_link(myself, build.revision, build.tree) -yield td%s/td % build.tree -yield td%s/td % build_platform(build) -yield td%s/td % host_link(myself, build.host) -yield td%s/td % build.compiler -yield td%s/td % build_link(myself, build) -yield /tr +try: +build_platform_name = build_platform(build) +yield tr +yield td%s/td % util.dhm_time(build.age) +yield td%s/td % revision_link(myself, build.revision, build.tree) +yield td%s/td % build.tree +yield td%s/td % build_platform_name +yield td%s/td % host_link(myself, build.host) +yield td%s/td % build.compiler +yield td%s/td % build_link(myself, build) +yield /tr +except hostdb.NoSuchHost: +pass yield /tbody/table yield /div @@ -619,7 +627,6 @@ class ViewHostPage(BuildFarmPage): try: host = self.buildfarm.hostdb[hostname] except hostdb.NoSuchHost: -deadhosts.append(hostname) continue builds = list(self.buildfarm.get_host_builds(hostname)) if len(builds) 0: @@ -675,7 +682,7 @@ class ViewHostPage(BuildFarmPage): try: platform = self.buildfarm.hostdb[host].platform.encode(utf-8) except hostdb.NoSuchHost: -platform = UNKNOWN +continue yield trtd%s/tdtd%s/tdtd%s/td/tr %\ (host, platform, util.dhm_time(age)) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 2be44d5 the lcov version has changed, as has the output format
from 909b72b Revive lcov reporting
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 2be44d5bd6d4370ebe81a28b10f224d958f920c8
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 19:45:43 2012 +1100
the lcov version has changed, as has the output format
---
Summary of changes:
buildfarm/__init__.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 380b47b..3708dc2 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -43,7 +43,7 @@ def read_trees_from_conf(path):
def lcov_extract_percentage(f):
Extract the coverage percentage from the lcov file.
-m = re.search('\td
class=headerItem.*?\Code\nbsp\;covered\:\\/td\.*?\n.*?\td
class=headerValue.*?\([0-9.]+) \%', f.read())
+m = re.search('\td class=headerCovTableEntryLo.*?\([0-9.]+) \%',
f.read())
if m:
return m.group(1)
else:
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via dad635c output callcatcher for non-samba builds as well
from 2be44d5 the lcov version has changed, as has the output format
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit dad635c9104962897942c0b7ec1f094ef0182547
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 21:01:16 2012 +1100
output callcatcher for non-samba builds as well
---
Summary of changes:
build_test.fns |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index d0299c5..173ba08 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -344,6 +344,9 @@ action_lcovreport() {
action_callcatcherreport() {
if [ $CALLCATCHER_REPORT = yes ]; then
case $tree in
+ tdb|talloc|ldb)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
+ ;;
samba_3_master*)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
;;
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1e94282 add missing format string from dad635c output callcatcher for non-samba builds as well http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1e94282a29a9528b7a2337d1b7c815a919e07c4c Author: Amitay Isaacs ami...@gmail.com Date: Fri Feb 17 17:55:08 2012 +1100 add missing format string --- Summary of changes: mail-dead-hosts.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py index 1499912..fada47e 100755 --- a/mail-dead-hosts.py +++ b/mail-dead-hosts.py @@ -53,7 +53,7 @@ why we have not heard from your host? If you no longer wish your host to participate in the Samba Build Farm, then please let us know so we can remove its records. -You can see the summary for your host at: +You can see the summary for your host at: %s Thanks, -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via b194d41 fix VACUUM to run on correct db from 1e94282 add missing format string http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit b194d41a998327c4cd3116088414bf5eb358ca28 Author: Andrew Bartlett abart...@samba.org Date: Fri Feb 17 21:25:59 2012 +1100 fix VACUUM to run on correct db --- Summary of changes: daily.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/daily.sh b/daily.sh index 8bc5304..9441b38 100755 --- a/daily.sh +++ b/daily.sh @@ -6,7 +6,7 @@ set -x ( date set -x -sqlite3 `dirname $0`/hostdb.sqlite 'VACUUM;' +sqlite3 `dirname $0`/db/hostdb.sqlite 'VACUUM;' cd `dirname $0` ./mail-dead-hosts.py echo deleting old file that are not used any more -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via f4cf0c5 also return unfiltered callanalyse output
from b194d41 fix VACUUM to run on correct db
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit f4cf0c5976dcdd23d7ef9f2089d2bf00e8b62832
Author: Andrew Bartlett abart...@samba.org
Date: Sat Feb 18 17:15:52 2012 +1100
also return unfiltered callanalyse output
---
Summary of changes:
build_test.fns |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 173ba08..50ab43c 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -347,11 +347,9 @@ action_callcatcherreport() {
tdb|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/unused-fns.txt
;;
- samba_3_master*)
- callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
- ;;
- samba_4*)
- callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
+ samba_3_master|samba_4*)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* $builddir/coverage/all-unused-fns.txt
+ grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/all-unused-fns.txt $builddir/coverage/unused-fns.txt
;;
esac
rc=$?
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 909b72b Revive lcov reporting
from 3af7f62 remove old s3-waf build from host tridge
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 909b72b4e3da7c5210d820bdf7a7228739d03284
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 17 17:11:49 2012 +1100
Revive lcov reporting
---
Summary of changes:
build_test.fns| 39 +++
buildfarm/__init__.py | 16 +++-
buildfarm/web/__init__.py | 12
coverage.fns | 17 +
magni.fns | 23 ---
web/compilers.list|1 +
6 files changed, 80 insertions(+), 28 deletions(-)
create mode 100644 coverage.fns
delete mode 100644 magni.fns
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index b5ab052..d0299c5 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -321,9 +321,11 @@ action_lcovreport() {
samba_3_master*)
lcov --base-directory $builddir --directory
$builddir/.. --capture --output-file $builddir/$tree.lcov.info
;;
- samba_4*)
- # rm -f heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
- lcov --base-directory $builddir --directory
$builddir/.. --capture --output-file $builddir/$tree.lcov.info
+ samba_4*|tdb|talloc|ldb|libreplace)
+ lcov --base-directory $builddir/bin --directory
$builddir/bin --capture --output-file $builddir/$tree.lcov.info
+ ;;
+ waf)
+ lcov --base-directory $builddir/demos --directory
$builddir/demos --capture --output-file $builddir/$tree.lcov.info
;;
*)
lcov --base-directory $builddir --directory $builddir
--capture --output-file $builddir/$tree.lcov.info
@@ -339,6 +341,25 @@ action_lcovreport() {
fi
}
+action_callcatcherreport() {
+ if [ $CALLCATCHER_REPORT = yes ]; then
+ case $tree in
+ samba_3_master*)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
+ ;;
+ samba_4*)
+ callanalyse `find $builddir/bin -name \*.so*`
$builddir/bin/* | grep -v -f $srcdir/callcatcher-exceptions.grep
$builddir/coverage/unused-fns.txt
+ ;;
+ esac
+ rc=$?
+ echo return code: $rc
+ else
+ echo CALLCATCHER_REPORT not set and callcatcher asked
+ echo Most probably an error please fix !
+ return 1
+ fi
+}
+
# configure the tree
@@ -740,6 +761,8 @@ test_tree() {
esac
if [ $LCOV_REPORT = yes ]; then
+ PRE_GCOV_CFLAGS=$CFLAGS
+ PRE_GCOV_LDFLAGS=$LDFLAGS
GCOV_FLAGS=--coverage
CFLAGS=$CFLAGS $GCOV_FLAGS
LDFLAGS=$LDFLAGS $GCOV_FLAGS
@@ -758,6 +781,11 @@ test_tree() {
send_logs_skip $log $err
unlock_file $lck
echo Ending build of $tree.$compiler in process $$ at `date`
+ if [ $LCOV_REPORT = yes ]; then
+ CFLAGS=$PRE_GCOV_CFLAGS
+ LDFLAGS=$PRE_GCOV_LDFLAGS
+ export CFLAGS LDFLAGS
+ fi
return
fi
@@ -769,7 +797,7 @@ test_tree() {
actions=$*
if [ $actions = ]; then
- actions=configure config_log config_header build install test
+ actions=configure config_log config_header build install test
$EXTRA_ACTIONS
fi
# start the build
@@ -894,6 +922,9 @@ test_tree() {
chmod u=rwX,g=rX,o=rX -R $builddir/coverage
rsync -rct -q --password-file=.password -z --timeout=200 \
$builddir/coverage/
$h...@build.samba.org::lcov_data/$host/$tree/
+ CFLAGS=$PRE_GCOV_CFLAGS
+ LDFLAGS=$PRE_GCOV_LDFLAGS
+ export CFLAGS LDFLAGS
fi
cd $test_root
diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py
index 1413421..380b47b 100644
--- a/buildfarm/__init__.py
+++ b/buildfarm/__init__.py
@@ -52,7 +52,7 @@ def lcov_extract_percentage(f):
class BuildFarm(object):
-LCOVHOST = magni
+LCOVHOST = coverage
OLDAGE = 60*60*4,
DEADAGE = 60*60*24*4
@@ -110,6 +110,20 @@ class BuildFarm(object):
finally:
lcov_html.close()
+def unused_fns(self, tree):
+get status of build
+
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 3af7f62 remove old s3-waf build from host tridge via f718dfe python-2.6 devel libraries installed on tridge (ppc64 box) from 2fb8a4d Support uxsuccess. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 3af7f627f3b9bfc1940d5273f181180791e41f9b Author: Andrew Bartlett abart...@samba.org Date: Thu Dec 22 14:43:09 2011 +1100 remove old s3-waf build from host tridge commit f718dfe7518e81e9f4379d453dd969266ec3 Author: Amitay Isaacs ami...@gmail.com Date: Wed Dec 21 15:37:27 2011 +1100 python-2.6 devel libraries installed on tridge (ppc64 box) No need for local copy of python. --- Summary of changes: tridge.fns |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/tridge.fns b/tridge.fns index 03f5d9d..f598200 100644 --- a/tridge.fns +++ b/tridge.fns @@ -2,7 +2,6 @@ per_run_hook global_lock -. install_python.fns compilers=gcc for compiler in $compilers; do @@ -13,7 +12,6 @@ for compiler in $compilers; do test_tree samba_3_current source3 $compiler test_tree samba_3_next source3 $compiler test_tree samba_3_master source3 $compiler - test_tree samba_3_waf source3 $compiler done global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 2fb8a4d Support uxsuccess.
from 01a3d51 now that samba_3_waf is just a regular part of the build,
remove seperate tree
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 2fb8a4dc3e9eab885984c79c37b3b0b6dc951e68
Author: Jelmer Vernooij jel...@samba.org
Date: Fri Dec 9 00:40:03 2011 +0100
Support uxsuccess.
---
Summary of changes:
buildfarm/web/__init__.py |4 +++-
web/build_farm.css|3 +++
2 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 904733c..f8ac04a 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -167,6 +167,8 @@ def subunit_to_buildfarm_result(subunit_result):
return failed
elif subunit_result == xfail:
return xfailed
+elif subunit_result == uxsuccess:
+return uxpassed
else:
return unknown
@@ -239,7 +241,7 @@ class LogPrettyPrinter(object):
log = re.sub(
^test: ([\w\-=,_:\ /.; \(\)]+).*?
(.*?)
- (success|xfail|failure|skip): [\w\-=,_:\ /.; \(\)]+(
\[.*?\])?.*?
+ (success|xfail|failure|skip|uxsuccess): [\w\-=,_:\ /.; \(\)]+(
\[.*?\])?.*?
, self._format_test, log)
return pre%s/pre % log
diff --git a/web/build_farm.css b/web/build_farm.css
index 860d438..136bea3 100644
--- a/web/build_farm.css
+++ b/web/build_farm.css
@@ -11,6 +11,7 @@
#log .status.error { color: rgb(153, 0, 0); }
#log .status.warning { color: rgb(153, 75, 0); }
#log .status.xfailed { color: rgb(153, 75, 0); }
+#log .status.uxpassed {color: rgb(153, 0, 0); }
#log .status.mistake { color: rgb(0, 0, 153); }
#log .output {
color: rgb(0, 0, 0);
@@ -26,6 +27,7 @@
#log div.unit.skipped {background-color: rgb(180, 180, 255); }
#log div.unit.warning {background-color: rgb(255, 180, 125); }
#log div.unit.xfailed {background-color: rgb(255, 180, 125); }
+#log div.unit.uxpassed { background-color: rgb(255, 180, 180); }
#log div.unit.error { background-color: rgb(255, 180, 180); }
#log div.unit.mistake {background-color: rgb(180, 180, 255); }
@@ -36,6 +38,7 @@
#log .unit.mistake .output { display: none;}
#log .unit.warning .output { display: none;}
#log .unit.xfailed .output { display: none;}
+#log .unit.uxpassed .output { display: none;}
#log .unit.errorlog .output { display: none;}
#log div.status.errorlog { display: none;}
img + div.action.title {margin-left: 0.5em;}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 01a3d51 now that samba_3_waf is just a regular part of the build,
remove seperate tree
from 0c5ef6c update location of upstream waf tree
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 01a3d51024f13d6b4b92899910950e7301bfec18
Author: Andrew Bartlett abart...@samba.org
Date: Fri Oct 7 20:23:17 2011 +1100
now that samba_3_waf is just a regular part of the build, remove seperate
tree
---
Summary of changes:
SerNet-IRIX.fns |1 -
SerNet-Tru64.fns|1 -
SerNet-aix.fns |1 -
SerNet-solaris8.fns |1 -
build_test.fns | 11 +--
charis.fns |1 -
fjall.fns |1 -
generic.fns |1 -
gwen.fns|1 -
hape.fns|1 -
m104.fns|1 -
magni.fns |1 -
opi.fns |1 -
qnx18.fns |1 -
sunX.fns|1 -
web/trees.conf |6 --
16 files changed, 1 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 1a4d7b4..9475898 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -20,7 +20,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
done
global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index efb706d..8622412 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -26,7 +26,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index d7bb98a..825a42a 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -27,7 +27,6 @@ test_tree lorikeet-heimdal . $compiler
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
test_tree pidl . cc build test
compiler=xlc_r
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 6798044..66464f4 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -38,7 +38,6 @@ for compiler in $compilers; do
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
- test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
done
diff --git a/build_test.fns b/build_test.fns
index 4616cd6..b5ab052 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -353,15 +353,6 @@ action_configure() {
echo CONFIGURE STATUS: $cstatus
return $cstatus
;;
- samba_3_waf)
- $builddir/timelimit $MAXTIME $srcdir/autogen-waf.sh
- cstatus=$?
- echo autogen-waf.sh STATUS: $cstatus
- if [ x$cstatus != x0 ]; then
- return $cstatus
- fi
- # fall through
- ;;
esac
if [ ! -x $srcdir/configure -a -r $srcdir/Makefile.PL ]; then
@@ -965,7 +956,7 @@ per_run_hook() {
old_trees=web popt distcc samba-gtk smb-build lorikeet-heimdal
samba_3_2
old_trees=$old_tree samba_3_2_test samba4 samba_4_0_waf
samba_4_0_waf.metze
- old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
+ old_trees=$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/charis.fns b/charis.fns
index 0e8eb11..f3cad96 100755
--- a/charis.fns
+++ b/charis.fns
@@ -11,6 +11,5 @@ compiler=gcc
test_tree samba_4_0_test . gcc
export config=--enable-merged-build
test_tree samba_3_master source3 gcc
-test_tree samba_3_waf source3 gcc
global_unlock
diff --git a/fjall.fns b/fjall.fns
index dc3adfe..4398ba8 100644
--- a/fjall.fns
+++ b/fjall.fns
@@ -25,7 +25,6 @@ test_tree samba_4_0_test . $compiler
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
export TESTS_ENVIRONMENT=$PWD/lorikeet-heimdal/libtool --mode=execute
valgrind --trace-children=yes --quiet -q --num-callers=30
--gen-suppressions=all
--suppressions=$PWD/lorikeet-heimdal/cf/valgrind-suppressions
test_tree lorikeet-heimdal . $compiler
diff --git a/generic.fns b/generic.fns
index 453097e..25a6b2e 100644
--- a/generic.fns
+++ b/generic.fns
@@ -64,7 +64,6 @@ for
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 0c5ef6c update location of upstream waf tree from 434956b use --enabled-shared in python install script http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 0c5ef6c5542f5573180078503abd70a1cef57184 Author: Andrew Tridgell tri...@samba.org Date: Wed Oct 5 13:30:35 2011 +1100 update location of upstream waf tree --- Summary of changes: common.fns|3 +-- import-and-analyse.py |3 +-- web/trees.conf|4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/common.fns b/common.fns index 0768d87..87fe12d 100644 --- a/common.fns +++ b/common.fns @@ -11,5 +11,4 @@ test_tree ccache-maint . $compiler test_tree talloc . $compiler test_tree tdb . $compiler test_tree ldb . $compiler -test_tree waf-svn demos $compiler - +test_tree waf demos $compiler diff --git a/import-and-analyse.py b/import-and-analyse.py index c7ef5cb..2318cc1 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -38,9 +38,8 @@ smtp.connect() def check_and_send_mails(cur, old): -if cur.tree is waf-svn: +if cur.tree is waf: # no point sending emails, as the email addresses are invalid -# from git svn return if cur.tree is samba_3_waf: diff --git a/web/trees.conf b/web/trees.conf index 9ab398a..3b497d1 100644 --- a/web/trees.conf +++ b/web/trees.conf @@ -83,7 +83,7 @@ scm = git repo = rsync.git branch = master -[waf-svn] +[waf] scm = git -repo = waf-svn.git +repo = waf.git branch = master -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 434956b use --enabled-shared in python install script
from 584a1fe the ppc64 box 'tridge' needs the python devel headers
installed
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 434956b37afb55a418d488233a6afaf907d4e8d2
Author: Andrew Tridgell tri...@samba.org
Date: Thu Sep 8 13:51:17 2011 +1000
use --enabled-shared in python install script
this makes the build much smaller, and fixes a problem on 'tridge' in
the build farm
---
Summary of changes:
install_python.fns |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/install_python.fns b/install_python.fns
index d44b999..d3c4d64 100644
--- a/install_python.fns
+++ b/install_python.fns
@@ -14,7 +14,7 @@ do_install_python() {
rm -rf $VERSION || exit 1
tar -xf $VERSION.tar || exit 1
cd $VERSION || exit 1
- ./configure --prefix=$HOME/python --disable-ipv6 || exit 1
+ ./configure --prefix=$HOME/python --disable-ipv6 --enable-shared ||
exit 1
make || exit 1
make install || exit 1
cd ../.. || exit 1
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via f36e05d use www.samba.org as server for the css from 6767f4c try and find config.h in one more location http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit f36e05db849e06f313c4e2d9672a21228441f696 Author: Björn Jacke b...@sernet.de Date: Wed Aug 31 21:00:04 2011 +0200 use www.samba.org as server for the css --- Summary of changes: buildfarm/web/__init__.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 84e7bb3..904733c 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -906,7 +906,7 @@ class BuildFarmApp(object): yield meta name='description' contents='Home of the Samba Build Farm, the automated testing facility.'/\n yield meta name='robots' contents='noindex'/ yield link rel='stylesheet' href='/build_farm.css' type='text/css' media='all'/ -yield link rel='stylesheet' href='http://master.samba.org/samba/style/common.css' type='text/css' media='all'/ +yield link rel='stylesheet' href='http://www.samba.org/samba/style/common.css' type='text/css' media='all'/ yield link rel='shortcut icon' href='http://www.samba.org/samba/images/favicon.ico'/ yield /head yield body -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 584a1fe the ppc64 box 'tridge' needs the python devel headers installed from f36e05d use www.samba.org as server for the css http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 584a1fe97bf0488f4ee1e02d79d089e939524f88 Author: Andrew Tridgell tri...@samba.org Date: Thu Sep 1 08:28:19 2011 +1000 the ppc64 box 'tridge' needs the python devel headers installed --- Summary of changes: gwen.fns = tridge.fns |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) copy gwen.fns = tridge.fns (94%) Changeset truncated at 500 lines: diff --git a/gwen.fns b/tridge.fns similarity index 94% copy from gwen.fns copy to tridge.fns index a9ee75a..03f5d9d 100644 --- a/gwen.fns +++ b/tridge.fns @@ -3,7 +3,7 @@ per_run_hook global_lock . install_python.fns -compilers=gcc cc +compilers=gcc for compiler in $compilers; do . common.fns -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 6767f4c try and find config.h in one more location
from 553d9b4 added samba_3_waf to the list of trees in the web interface
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 6767f4c9fff042535141e33f3ea1e1479d6b4f77
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 9 06:53:00 2011 +1000
try and find config.h in one more location
---
Summary of changes:
build_test.fns |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 7b2bff8..4616cd6 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -426,7 +426,7 @@ action_config_log() {
action_config_header() {
- hdr_files=config.h include/config.h bin/default/config.h
bin/default/include/config.h bin/default/source3/include/config.h
+ hdr_files=config.h include/config.h include/autoconf/config.h
bin/default/config.h bin/default/include/config.h
bin/default/source3/include/config.h
for h in $hdr_files; do
if [ -f $h ]; then
echo contents of $h:
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via ecacea8 enable samba_3_waf build
via 64bff4a don't send emails about samba_3_waf builds yet
via 6c458e6 support samba_3_waf builds
from 00aea84 switch the build farm to using the top level Samba4 build
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit ecacea86a2010b814daff025f5575b8d5bf9141c
Author: Andrew Tridgell tri...@samba.org
Date: Wed Feb 9 10:19:00 2011 +1100
enable samba_3_waf build
also switch to source3 for s3 builds, which better matches what end
users do
commit 64bff4a492fb94f8e45b0998ab24a79aec86ed84
Author: Andrew Tridgell tri...@samba.org
Date: Wed Feb 9 10:18:30 2011 +1100
don't send emails about samba_3_waf builds yet
commit 6c458e631fb03370d57724bb917e58053e04b306
Author: Andrew Tridgell tri...@samba.org
Date: Wed Feb 9 10:18:18 2011 +1100
support samba_3_waf builds
---
Summary of changes:
SerNet-IRIX.fns |8
SerNet-Tru64.fns |7 ---
SerNet-aix.fns|7 ---
SerNet-solaris8.fns |7 ---
build_test.fns| 11 ++-
charis.fns|3 ++-
fjall.fns |7 ---
generic.fns |7 ---
gwen.fns |7 ---
hape.fns |7 ---
import-and-analyse.py |4
m104.fns |7 ---
magni.fns |7 ---
opi.fns |7 ---
qnx18.fns |7 ---
sunX.fns |7 ---
16 files changed, 68 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 8713691..1a4d7b4 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -17,10 +17,10 @@ for compiler in $compilers; do
test_tree samba_4_0_test . $compiler
- test_tree samba_3_current source $compiler
- test_tree samba_3_next source $compiler
- test_tree samba_3_master source $compiler
-
+ test_tree samba_3_current source3 $compiler
+ test_tree samba_3_next source3 $compiler
+ test_tree samba_3_master source3 $compiler
+ test_tree samba_3_waf source3 $compiler
done
global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 188991b..efb706d 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -23,9 +23,10 @@ for compiler in $compilers; do
CPPFLAGS=$SAVED_CPPFLAGS
export CPPFLAGS
- test_tree samba_3_current source $compiler
- test_tree samba_3_next source $compiler
- test_tree samba_3_master source $compiler
+ test_tree samba_3_current source3 $compiler
+ test_tree samba_3_next source3 $compiler
+ test_tree samba_3_master source3 $compiler
+ test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index 56632ef..d7bb98a 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -24,9 +24,10 @@ compiler=cc
. common.fns
test_tree lorikeet-heimdal . $compiler
-test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
-test_tree samba_3_master source $compiler
+test_tree samba_3_current source3 $compiler
+test_tree samba_3_next source3 $compiler
+test_tree samba_3_master source3 $compiler
+test_tree samba_3_waf source3 $compiler
test_tree pidl . cc build test
compiler=xlc_r
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index b76abda..6798044 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -35,9 +35,10 @@ for compiler in $compilers; do
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
test_tree samba_4_0_test . $compiler
- test_tree samba_3_current source $compiler
- test_tree samba_3_next source $compiler
- test_tree samba_3_master source $compiler
+ test_tree samba_3_current source3 $compiler
+ test_tree samba_3_next source3 $compiler
+ test_tree samba_3_master source3 $compiler
+ test_tree samba_3_waf source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
done
diff --git a/build_test.fns b/build_test.fns
index 552862a..7b2bff8 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -345,7 +345,7 @@ action_lcovreport() {
action_configure() {
-
+# special handling for some trees
case $tree in
waf*)
$builddir/timelimit $MAXTIME ./waf configure
@@ -353,6 +353,15 @@ action_configure() {
echo CONFIGURE STATUS: $cstatus
return $cstatus
;;
+ samba_3_waf)
+ $builddir/timelimit $MAXTIME $srcdir/autogen-waf.sh
+ cstatus=$?
+ echo autogen-waf.sh STATUS: $cstatus
+ if [ x$cstatus != x0 ]; then
+
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 553d9b4 added samba_3_waf to the list of trees in the web interface from ecacea8 enable samba_3_waf build http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 553d9b4dbf9f49e20a666706e4848ede60155674 Author: Andrew Tridgell tri...@samba.org Date: Wed Feb 9 10:21:18 2011 +1100 added samba_3_waf to the list of trees in the web interface --- Summary of changes: web/trees.conf | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/web/trees.conf b/web/trees.conf index 10bf3eb..9ab398a 100644 --- a/web/trees.conf +++ b/web/trees.conf @@ -22,19 +22,25 @@ branch = trunk scm = git repo = samba.git branch = v3-5-test -srcdir = source +srcdir = source3 [samba_3_next] scm = git repo = samba.git branch = v3-6-test -srcdir = source +srcdir = source3 [samba_3_master] scm = git repo = samba.git branch = master -srcdir = source +srcdir = source3 + +[samba_3_waf] +scm = git +repo = samba.git +branch = master +srcdir = source3 [samba_4_0_test] scm = git -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 00aea84 switch the build farm to using the top level Samba4 build
from 5abd0ba don't send emails for waf-svn tree
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 00aea844d6ff939ba9806ae2381974c4e5bcde11
Author: Andrew Tridgell tri...@samba.org
Date: Mon Feb 7 14:24:30 2011 +1100
switch the build farm to using the top level Samba4 build
---
Summary of changes:
SerNet-IRIX.fns |2 +-
SerNet-Tru64.fns|2 +-
SerNet-aix.fns |2 +-
SerNet-solaris8.fns |2 +-
build_test.fns |2 +-
charis.fns |2 +-
fjall.fns |2 +-
generic.fns |2 +-
gwen.fns|2 +-
hape.fns|2 +-
magni.fns |2 +-
opi.fns |2 +-
qnx18.fns |2 +-
sunX.fns|2 +-
web/trees.conf |2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 4e07389..8713691 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -15,7 +15,7 @@ for compiler in $compilers; do
#export config=--with-included-popt
. common.fns
- test_tree samba_4_0_test source4 $compiler
+ test_tree samba_4_0_test . $compiler
test_tree samba_3_current source $compiler
test_tree samba_3_next source $compiler
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 37a5540..188991b 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -19,7 +19,7 @@ for compiler in $compilers; do
CPPFLAGS=
export TDB_NO_FSYNC
export CPPFLAGS
- test_tree samba_4_0_test source4 $compiler
+ test_tree samba_4_0_test . $compiler
CPPFLAGS=$SAVED_CPPFLAGS
export CPPFLAGS
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index 8fb9815..56632ef 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -30,6 +30,6 @@ test_tree samba_3_master source $compiler
test_tree pidl . cc build test
compiler=xlc_r
-test_tree samba_4_0_test source4 $compiler
+test_tree samba_4_0_test . $compiler
global_unlock
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index a652f2a..b76abda 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -34,7 +34,7 @@ for compiler in $compilers; do
. common.fns
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
- test_tree samba_4_0_test source4 $compiler
+ test_tree samba_4_0_test . $compiler
test_tree samba_3_current source $compiler
test_tree samba_3_next source $compiler
test_tree samba_3_master source $compiler
diff --git a/build_test.fns b/build_test.fns
index 496bf7f..552862a 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -417,7 +417,7 @@ action_config_log() {
action_config_header() {
- hdr_files=config.h include/config.h bin/default/config.h
bin/default/source4/include/config.h bin/default/source3/include/config.h
+ hdr_files=config.h include/config.h bin/default/config.h
bin/default/include/config.h bin/default/source3/include/config.h
for h in $hdr_files; do
if [ -f $h ]; then
echo contents of $h:
diff --git a/charis.fns b/charis.fns
index 5e789b1..cc41382 100755
--- a/charis.fns
+++ b/charis.fns
@@ -8,7 +8,7 @@ global_lock
system=`uname`
compiler=gcc
-test_tree samba_4_0_test source4 gcc
+test_tree samba_4_0_test . gcc
export config=--enable-merged-build
test_tree samba_3_master source gcc
diff --git a/fjall.fns b/fjall.fns
index 612a96b..8fb7017 100644
--- a/fjall.fns
+++ b/fjall.fns
@@ -21,7 +21,7 @@ export MAXTIME=36000
export SMBD_MAXTIME=36000
export SAMBA_MAXTIME=36000
-test_tree samba_4_0_test source4 $compiler
+test_tree samba_4_0_test . $compiler
test_tree samba_3_current source $compiler
test_tree samba_3_next source $compiler
test_tree samba_3_master source $compiler
diff --git a/generic.fns b/generic.fns
index 9de2b76..508afad 100644
--- a/generic.fns
+++ b/generic.fns
@@ -46,7 +46,7 @@ for compiler in $compilers; do
TDB_NO_FSYNC=1
export TDB_NO_FSYNC
-test_tree samba_4_0_test source4 $compiler
+test_tree samba_4_0_test . $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/gwen.fns b/gwen.fns
index 51219ce..3ee75c2 100644
--- a/gwen.fns
+++ b/gwen.fns
@@ -8,7 +8,7 @@ compilers=gcc cc
for compiler in $compilers; do
. common.fns
- test_tree samba_4_0_test source4 $compiler
+ test_tree samba_4_0_test . $compiler
test_tree samba_3_current source $compiler
test_tree samba_3_next source $compiler
diff --git a/hape.fns b/hape.fns
index 8c75a82..5ff0ab7 100644
--- a/hape.fns
+++ b/hape.fns
@@ -19,7 +19,7 @@ for compiler in gcc ; do
. common.fns
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 5abd0ba don't send emails for waf-svn tree from da3f635 fixed waf build status http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 5abd0baa2c272df06c6bc7af1c4a89da2558d683 Author: Andrew Tridgell tri...@samba.org Date: Fri Jan 14 08:41:48 2011 +1100 don't send emails for waf-svn tree the email addresses are invalid --- Summary of changes: import-and-analyse.py |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/import-and-analyse.py b/import-and-analyse.py index 375c4ba..5775b1f 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -37,6 +37,12 @@ smtp = smtplib.SMTP() smtp.connect() def check_and_send_mails(cur, old): + +if cur.tree is waf-svn: +# no point sending emails, as the email addresses are invalid +# from git svn +return + t = buildfarm.trees[cur.tree] diff = BuildDiff(t, old, cur) -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via da3f635 fixed waf build status
from 57ad9ee enable waf-svn on other hosts
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit da3f6358378a3c30937182cde21efc033da0f4cb
Author: Andrew Tridgell tri...@samba.org
Date: Tue Jan 11 09:04:07 2011 +1100
fixed waf build status
---
Summary of changes:
build_test.fns |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 7156f81..496bf7f 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -446,6 +446,7 @@ action_build() {
;;
waf*)
do_make build
+ bstatus=$?
;;
*)
do_make all
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 57ad9ee enable waf-svn on other hosts from 1a650b7 fixed links in build pages http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 57ad9ee417cf063ae40f81e979b7d71a07b2ae55 Author: Andrew Tridgell tri...@samba.org Date: Fri Dec 24 14:26:42 2010 +1100 enable waf-svn on other hosts --- Summary of changes: common.fns |1 + sn-devel-104.fns |3 --- 2 files changed, 1 insertions(+), 3 deletions(-) delete mode 100644 sn-devel-104.fns Changeset truncated at 500 lines: diff --git a/common.fns b/common.fns index 9ab15e9..0768d87 100644 --- a/common.fns +++ b/common.fns @@ -11,4 +11,5 @@ test_tree ccache-maint . $compiler test_tree talloc . $compiler test_tree tdb . $compiler test_tree ldb . $compiler +test_tree waf-svn demos $compiler diff --git a/sn-devel-104.fns b/sn-devel-104.fns deleted file mode 100644 index cfa6631..000 --- a/sn-devel-104.fns +++ /dev/null @@ -1,3 +0,0 @@ -. generic.fns -# test this just on sn-devel for now -test_tree waf-svn demos gcc -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via d813ccc added waf trunk to the build farm
from 642e09c Move some of the build diff logic to the buildfarm package.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit d813ccc652fcfbf9ec2f928519a0c589374a332f
Author: Andrew Tridgell tri...@samba.org
Date: Thu Dec 23 10:25:33 2010 +1100
added waf trunk to the build farm
---
Summary of changes:
build_test.fns | 97 +++
sn-devel.fns |3 ++
web/trees.conf |5 +++
3 files changed, 70 insertions(+), 35 deletions(-)
create mode 100644 sn-devel.fns
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index b7649bd..7156f81 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -164,7 +164,7 @@ choose_scm() {
tree=$1
case $tree in
- samba* | rsync | libreplace | talloc | tdb | ldb | pidl
| ccache*)
+ samba* | rsync | libreplace | talloc | tdb | ldb | pidl
| ccache* | waf*)
echo git
return 0
;;
@@ -237,35 +237,51 @@ unlock_file() {
do_make() {
- if [ x$MAKE = x ]; then
- MAKE=make
- fi
+# work out correct make command
+ case $tree in
+ waf*)
+ MAKECOMMAND=./waf
+ ;;
+ *)
+ MAKECOMMAND=$MAKE
+ if [ x$MAKECOMMAND = x ]; then
+ MAKECOMMAND=make
+ fi
+ ;;
+ esac
MMTIME=$MAXTIME
# some trees don't need as much time
case $tree in
- rsync | tdb | talloc | libreplace | ccache*)
+ rsync | tdb | talloc | libreplace | ccache* | waf*)
if [ $compiler != checker ]; then
MMTIME=`expr $MMTIME / 5`
fi
;;
esac
+ # special build for some trees
+ case $tree in
+ waf*)
+ ./waf distclean ./waf configure build
+ ;;
+ esac
+
for t in $*; do
if [ x$BUILD_FARM_NUM_JOBS = x ]; then
- echo $MAKE $t
- $builddir/timelimit $MMTIME $MAKE $t
+ echo $MAKECOMMAND $t
+ $builddir/timelimit $MMTIME $MAKECOMMAND $t
status=$?
else
# we can parallelize everything and all targets
if [ x$t = xeverything ] || [ x$t = xall]; then
- echo $MAKE -j$BUILD_FARM_NUM_JOBS $t
- $builddir/timelimit $MMTIME $MAKE
-j$BUILD_FARM_NUM_JOBS $t
+ echo $MAKECOMMAND -j$BUILD_FARM_NUM_JOBS
$t
+ $builddir/timelimit $MMTIME $MAKECOMMAND
-j$BUILD_FARM_NUM_JOBS $t
status=$?
else
- echo $MAKE $t
- $builddir/timelimit $MMTIME $MAKE $t
+ echo $MAKECOMMAND $t
+ $builddir/timelimit $MMTIME $MAKECOMMAND $t
status=$?
fi
fi
@@ -276,7 +292,7 @@ do_make() {
;;
*)
#run again with V=1, so we see failed
commands
- $builddir/timelimit $MMTIME $MAKE
$t V=1
+ $builddir/timelimit $MMTIME
$MAKECOMMAND $t V=1
status=$?
;;
esac
@@ -330,6 +346,15 @@ action_lcovreport() {
action_configure() {
+ case $tree in
+ waf*)
+ $builddir/timelimit $MAXTIME ./waf configure
+ cstatus=$?
+ echo CONFIGURE STATUS: $cstatus
+ return $cstatus
+ ;;
+ esac
+
if [ ! -x $srcdir/configure -a -r $srcdir/Makefile.PL ]; then
perl $srcdir/Makefile.PL PREFIX=$prefix
cstatus=$?
@@ -419,6 +444,9 @@ action_build() {
do_make everything torture
bstatus=$?
;;
+ waf*)
+ do_make build
+ ;;
*)
do_make all
bstatus=$?
@@ -626,30 +654,36 @@ test_tree() {
return
}
- if [ ! -x $srcdir/configure ] [ $tree != pidl ]; then
- echo skip: $tree.$compiler configure not present, try
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 2cba6f7 fixed name of sn-devel-104.fns from d813ccc added waf trunk to the build farm http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 2cba6f71823b71057d0969ac1fb6967830636ad8 Author: Andrew Tridgell tri...@samba.org Date: Thu Dec 23 11:00:06 2010 +1100 fixed name of sn-devel-104.fns --- Summary of changes: sn-devel.fns = sn-devel-104.fns |0 1 files changed, 0 insertions(+), 0 deletions(-) rename sn-devel.fns = sn-devel-104.fns (100%) Changeset truncated at 500 lines: diff --git a/sn-devel.fns b/sn-devel-104.fns similarity index 100% rename from sn-devel.fns rename to sn-devel-104.fns -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 992c6c3 fixed branches for rsync and waf from 2cba6f7 fixed name of sn-devel-104.fns http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 992c6c39eb914ec2f5af9317668401834213544e Author: Andrew Tridgell tri...@samba.org Date: Thu Dec 23 11:02:41 2010 +1100 fixed branches for rsync and waf --- Summary of changes: web/trees.conf |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/web/trees.conf b/web/trees.conf index af22150..e3052bc 100644 --- a/web/trees.conf +++ b/web/trees.conf @@ -75,9 +75,9 @@ subdir = pidl/ [rsync] scm = git repo = rsync.git -branch = HEAD +branch = master [waf-svn] scm = git repo = waf-svn.git -branch = HEAD +branch = master -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1a650b7 fixed links in build pages from 992c6c3 fixed branches for rsync and waf http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1a650b7a64331f777ca29b0d1e98b953f9fa29d0 Author: Andrew Tridgell tri...@samba.org Date: Thu Dec 23 11:05:32 2010 +1100 fixed links in build pages --- Summary of changes: web/header3.html |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/web/header3.html b/web/header3.html index afa754a..ab9a540 100644 --- a/web/header3.html +++ b/web/header3.html @@ -9,8 +9,8 @@ div id=nav img src=/build.png alt=Build Farm / ul -lia href=about.htmlAbout the build farm/a/li -lia href=instructions.htmlAdding a new machine/a/li +lia href=/about.htmlAbout the build farm/a/li +lia href=/instructions.htmlAdding a new machine/a/li lia href=http://www.samba.org/;Samba Web pages/a/li /ul -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 2ec2d06 Add +recent-ids.
from 8703cf4 test for fixing heimdal build on aix
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 2ec2d06b13ea3add35f8c131e533209d19d72764
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Dec 20 00:37:34 2010 +0100
Add +recent-ids.
---
Summary of changes:
buildfarm/build.py|9 +
buildfarm/web/__init__.py | 10 --
2 files changed, 17 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/build.py b/buildfarm/build.py
index 7689364..e8f9664 100644
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -349,6 +349,15 @@ class Build(object):
except IOError:
raise LogFileMissing()
+def has_log(self):
+try:
+f = self.read_log()
+except LogFileMissing:
+return False
+else:
+f.close()
+return True
+
def read_err(self):
read full err file
try:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index e401a31..84e7bb3 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -987,14 +987,20 @@ class BuildFarmApp(object):
else:
fn = wsgiref.util.shift_path_info(environ)
if fn == tree:
-start_response('200 OK', [
-('Content-type', 'text/html; charset=utf-8')])
tree = wsgiref.util.shift_path_info(environ)
subfn = wsgiref.util.shift_path_info(environ)
if subfn in (, None, +recent):
+start_response('200 OK', [
+('Content-type', 'text/html; charset=utf-8')])
page = ViewRecentBuildsPage(self.buildfarm)
yield .join(self.html_page(form, page.render(myself,
tree, get_param(form, 'sortby') or 'age')))
+elif subfn == +recent-ids:
+start_response('200 OK', [
+('Content-type', 'text/plain; charset=utf-8')])
+yield .join([x.log_checksum()+\n for x in
self.buildfarm.get_tree_builds(tree) if x.has_log()])
else:
+start_response('200 OK', [
+('Content-type', 'text/html; charset=utf-8')])
yield Unknown subfn %s % subfn
elif fn == host:
start_response('200 OK', [
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 642e09c Move some of the build diff logic to the buildfarm package. from 2ec2d06 Add +recent-ids. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 642e09c0e2b37001c794feb1edfb9bc435cfcf94 Author: Jelmer Vernooij jel...@samba.org Date: Mon Dec 20 01:17:38 2010 +0100 Move some of the build diff logic to the buildfarm package. --- Summary of changes: buildfarm/build.py| 23 +++ import-and-analyse.py | 25 ++--- 2 files changed, 33 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index e8f9664..fae37a1 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -614,3 +614,26 @@ class BuildResultStore(object): if build is None: raise NoSuchBuildError(tree, host, compiler) return build + + +class BuildDiff(object): +Represents the difference between two builds. + +def __init__(self, tree, old, new): +self.tree = tree +self.old = old +self.new = new +self.new_rev = new.revision_details() +self.new_status = new.status() + +self.old_rev = old.revision_details() +self.old_status = old.status() + +def is_regression(self): +Is there a regression in new build since old build? +return self.new_status.regressed_since(self.old_status) + +def revisions(self): +Returns the revisions introduced since old in new. +branch = self.tree.get_branch() +return branch.log(from_rev=self.new.revision, exclude_revs=set([self.old.revision])) diff --git a/import-and-analyse.py b/import-and-analyse.py index 9df77a3..375c4ba 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -11,6 +11,7 @@ on recent commits. from buildfarm.build import ( +BuildDiff, MissingRevisionInfo, NoSuchBuildError, ) @@ -37,23 +38,17 @@ smtp.connect() def check_and_send_mails(cur, old): t = buildfarm.trees[cur.tree] +diff = BuildDiff(t, old, cur) -cur_rev = cur.revision_details() -cur_status = cur.status() - -old_rev = old.revision_details() -old_status = old.status() - -if not cur_status.regressed_since(old_status): +if not diff.is_regression(): if opts.verbose = 3: -print ... hasn't regressed since %s: %s % (old_rev, old_status) +print ... hasn't regressed since %s: %s % (diff.old_rev, diff.old_status) return -branch = t.get_branch() recipients = set() change_log = -for rev in branch.log(from_rev=cur.revision, exclude_revs=set([old.revision])): +for rev in diff.revisions(): recipients.add(rev.author) recipients.add(rev.committer) change_log += @@ -82,15 +77,15 @@ The build may have been broken by one of the following commits: change_log: change_log, scm: t.scm, branch: t.branch, -cur_rev: cur_rev, -old_rev: old_rev, -cur_status: cur_status, -old_status: old_status, +cur_rev: diff.new_rev, +old_rev: diff.old_rev, +cur_status: diff.new_status, +old_status: diff.old_status, build_link: build_uri(http://build.samba.org/build.cgi;, cur) } msg = MIMEText(body) -msg[Subject] = BUILD of %s:%s BROKEN on %s with %s AT REVISION %s % (cur.tree, t.branch, cur.host, cur.compiler, cur_rev) +msg[Subject] = BUILD of %s:%s BROKEN on %s with %s AT REVISION %s % (cur.tree, t.branch, cur.host, cur.compiler, diff.new_rev) msg[From] = \Build Farm\ bu...@samba.org msg[To] = ,.join(recipients) if not opts.dry_run: -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via 8703cf4 test for fixing heimdal build on aix
from 45c555c Don't rely on stages having the same names.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit 8703cf4ba3ac33d7a4d497c46c3e507c9593ea78
Author: Matthieu Patou m...@matws.net
Date: Tue Dec 14 09:38:51 2010 +0300
test for fixing heimdal build on aix
---
Summary of changes:
SerNet-aix.fns | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index e8b5134..8fb9815 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -6,6 +6,19 @@ global_lock
PATH=/opt/home/tridge/python/bin:$PATH
export PATH
+PREHOOKS=configure
+
+prehook_configure()
+{
+case $tree in
+samba_4*)
+ (cd ${builddir}/..; gpatch -p 1 $HOME/patch_aix)
+;;
+*)
+;;
+esac
+}
+
compiler=cc
. common.fns
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 6bb8d56 Add assert message. from 9d3f47c Cope with negative failure numbers. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 6bb8d56672cb3ff20cff3758fa47e86089f86319 Author: Jelmer Vernooij jel...@samba.org Date: Tue Dec 14 08:46:07 2010 +0100 Add assert message. --- Summary of changes: buildfarm/build.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index 7c371b1..28ff6d9 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -132,7 +132,7 @@ class BuildStatus(object): return True for ((old_name, old_result), (new_name, new_result)) in zip( older.stages, self.stages): -assert old_name == new_name +assert old_name == new_name, build stage name mismatch: %s != %s % (old_name, new_name) if new_result == old_result: continue if new_result 0 and old_result = 0: -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 45c555c Don't rely on stages having the same names. from 6bb8d56 Add assert message. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 45c555c4dd5813c01835b31cabfadfbfb2f1919e Author: Jelmer Vernooij jel...@samba.org Date: Tue Dec 14 08:57:07 2010 +0100 Don't rely on stages having the same names. --- Summary of changes: buildfarm/build.py | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index 28ff6d9..7689364 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -130,9 +130,13 @@ class BuildStatus(object): if len(self.stages) len(older.stages): # Less stages completed return True -for ((old_name, old_result), (new_name, new_result)) in zip( -older.stages, self.stages): -assert old_name == new_name, build stage name mismatch: %s != %s % (old_name, new_name) +old_stages = dict(older.stages) +new_stages = dict(self.stages) +for name, new_result in new_stages.iteritems(): +try: +old_result = old_stages[name] +except KeyError: +continue if new_result == old_result: continue if new_result 0 and old_result = 0: -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via d088c44 give more time to gollum to run from be00e3a use compilers variable, print also which compiler is working http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit d088c44a8217e2152f4c004390a7e16d5063bec9 Author: Matthieu Patou m...@matws.net Date: Sun Dec 12 13:13:45 2010 +0300 give more time to gollum to run --- Summary of changes: builder72.fns = gollum.fns |0 1 files changed, 0 insertions(+), 0 deletions(-) copy builder72.fns = gollum.fns (100%) Changeset truncated at 500 lines: diff --git a/builder72.fns b/gollum.fns similarity index 100% copy from builder72.fns copy to gollum.fns -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 9d3f47c Cope with negative failure numbers. from d088c44 give more time to gollum to run http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 9d3f47c3a50abe44a990e40a0d56a5ee656491a8 Author: Jelmer Vernooij jel...@samba.org Date: Sun Dec 12 23:22:28 2010 +0100 Cope with negative failure numbers. --- Summary of changes: buildfarm/build.py|9 - buildfarm/tests/test_build.py | 14 ++ 2 files changed, 22 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index b6602ab..7c371b1 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -125,6 +125,7 @@ class BuildStatus(object): return False if (panic in self.other_failures and not panic in older.other_failures): +# If this build introduced panics, then that's always worse. return True if len(self.stages) len(older.stages): # Less stages completed @@ -132,8 +133,14 @@ class BuildStatus(object): for ((old_name, old_result), (new_name, new_result)) in zip( older.stages, self.stages): assert old_name == new_name -if new_result old_result: +if new_result == old_result: +continue +if new_result 0 and old_result = 0: return True +elif new_result = 0 and old_result 0: +return False +else: +return (abs(new_result) abs(old_result)) return False def __cmp__(self, other): diff --git a/buildfarm/tests/test_build.py b/buildfarm/tests/test_build.py index 6facb79..2fa31c1 100755 --- a/buildfarm/tests/test_build.py +++ b/buildfarm/tests/test_build.py @@ -341,6 +341,20 @@ class BuildStatusRegressedSinceTests(testtools.TestCase): b = BuildStatus(stages2, set(other_failures2)) self.assertEquals(expected, b.regressed_since(a)) +def test_negative(self): +self.assertRegressedSince( +False, +([(CONFIGURE, -1)], []), +([(CONFIGURE, 2)], [])) +self.assertRegressedSince( +False, +([(CONFIGURE, -1)], []), +([(CONFIGURE, 0)], [])) +self.assertRegressedSince( +True, +([(CONFIGURE, -1)], []), +([(CONFIGURE, -3)], [])) + def test_same(self): self.assertRegressedSince( False, -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via be00e3a use compilers variable, print also which compiler is working via 37e237e builder72: readd cc that removed by error from 5da1eb6 Sane error message on unknown revision. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit be00e3a59a48749de34a99f30ea45ef4432d9f93 Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 19:35:19 2010 +0300 use compilers variable, print also which compiler is working commit 37e237ea813d1a5450b4ad2c90077b6c6fa9768d Author: Matthieu Patou m...@matws.net Date: Fri Dec 10 19:14:30 2010 +0300 builder72: readd cc that removed by error --- Summary of changes: builder72.fns |2 ++ generic.fns |3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/builder72.fns b/builder72.fns index 45a7997..63bfc1f 100644 --- a/builder72.fns +++ b/builder72.fns @@ -4,5 +4,7 @@ MAXTIME=32400 # 9 hours SMBD_MAXTIME=25200 # 7 hours for a samba process .. # default maximum memory size (100M) for any command export MAXTIME SMBD_MAXTIME +compilers=gcc cc +export compilers . generic.fns diff --git a/generic.fns b/generic.fns index a19abdf..9de2b76 100644 --- a/generic.fns +++ b/generic.fns @@ -12,8 +12,9 @@ if [ x$compilers = x ]; then compilers=gcc cc icc fi -for compiler in gcc cc icc; do +for compiler in $compilers; do + echo working with compiler $compiler # arrgh, which gives no err code on solaris path=`which $compiler` if [ -x $path ]; then -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 03a9d85 Cope with unknown trees. from 58c09d2 reintroduce specific host file for tru64, in order to remove CPPFLAGS for S4 http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 03a9d85e61c5d6c5f348104bfde133b474e63299 Author: Jelmer Vernooij jel...@samba.org Date: Wed Dec 8 18:17:08 2010 +0100 Cope with unknown trees. --- Summary of changes: buildfarm/web/__init__.py | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index da42569..49aa6e5 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -371,6 +371,11 @@ class BuildFarmPage(object): return span class='old'%s/span % util.dhm_time(age) return util.dhm_time(age) +def tree_link(self, myself, treename): +try: +return tree_link(myself, self.buildfarm.trees[treename]) +except KeyError: +return treename def render(self, output_type): raise NotImplementedError(self.render) @@ -446,7 +451,7 @@ class ViewBuildPage(BuildFarmPage): (myself, build.host, build.tree, build.compiler, build.host, self.buildfarm.hostdb[build.host].platform.encode(utf-8)) if uname is not None: yield trtdUname:/tdtd%s/td/tr\n % uname -yield trtdTree:/tdtd%s/td/tr\n % tree_link(myself, self.buildfarm.trees[build.tree]) +yield trtdTree:/tdtd%s/td/tr\n % self.tree_link(myself, build.tree) yield trtdBuild Revision:/tdtd%s/td/tr\n % revision_link(myself, build.revision, build.tree) yield trtdBuild age:/tdtddiv class='age'%s/div/td/tr\n % self.red_age(build.age) yield trtdStatus:/tdtd%s/td/tr\n % build_link(myself, build) @@ -598,7 +603,7 @@ class ViewHostPage(BuildFarmPage): def _render_build_html(self, myself, build): warnings = build.err_count() yield tr -yield tdspan class='tree' + tree_link(myself, self.buildfarm.trees[build.tree]) +/span/ + build.compiler + /td +yield tdspan class='tree' + self.tree_link(myself, build.tree) +/span/ + build.compiler + /td yield td + revision_link(myself, build.revision, build.tree) + /td yield tddiv class='age' + self.red_age(build.age) + /div/td yield tddiv class='status'%s/div/td % build_link(myself, build) @@ -725,7 +730,7 @@ class ViewSummaryPage(BuildFarmPage): for tree in sorted(self.buildfarm.trees.keys()): yield tr -yield td%s/td % tree_link(myself, self.buildfarm.trees[tree]) +yield td%s/td % self.tree_link(myself, tree) yield td%s/td % host_count[tree] yield td%s/td % broken_count[tree] if panic_count[tree]: -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 5da1eb6 Sane error message on unknown revision. from 03a9d85 Cope with unknown trees. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 5da1eb6032da252cf2dd14aa36a8653f648c7bdd Author: Jelmer Vernooij jel...@samba.org Date: Wed Dec 8 18:19:07 2010 +0100 Sane error message on unknown revision. --- Summary of changes: buildfarm/web/__init__.py |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 49aa6e5..e401a31 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -820,7 +820,11 @@ class HistoryPage(BuildFarmPage): class DiffPage(HistoryPage): def render(self, myself, tree, revision): -t = self.buildfarm.trees[tree] +try: +t = self.buildfarm.trees[tree] +except KeyError: +yield Unknown tree %s % tree +return branch = t.get_branch() (entry, diff) = branch.diff(revision) # get information about the current diff -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1b79908 Cope with multiple builds with the same checksum. from f9d4536 Don't create subunit files on disk, rather just extract them out of the master file. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1b79908e5043852d221b86d7cf4edae98fabdc15 Author: Jelmer Vernooij jel...@samba.org Date: Tue Dec 7 09:39:19 2010 +0100 Cope with multiple builds with the same checksum. --- Summary of changes: import-and-analyse.py |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/import-and-analyse.py b/import-and-analyse.py index 2273b42..9df77a3 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -17,7 +17,6 @@ from buildfarm.build import ( from buildfarm import BuildFarm from buildfarm.web import build_uri from email.mime.text import MIMEText -import logging import optparse import resource import smtplib -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 1d47f19 ... and commit the right file from 1b79908 Cope with multiple builds with the same checksum. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 1d47f199949889de4bdf55a5a8c31fadf1f6ab7b Author: Jelmer Vernooij jel...@samba.org Date: Tue Dec 7 09:40:07 2010 +0100 ... and commit the right file --- Summary of changes: buildfarm/build.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index e5993ef..b6602ab 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -562,8 +562,8 @@ class BuildResultStore(object): def get_by_checksum(self, checksum): from buildfarm.sqldb import Cast result = self.store.find(StormBuild, -Cast(StormBuild.checksum, TEXT) == Cast(checksum, TEXT)) -ret = result.one() +Cast(StormBuild.checksum, TEXT) == Cast(checksum, TEXT)).order_by(Desc(StormBuild.upload_time)) +ret = result.first() if ret is None: raise NoSuchBuildError(None, None, None, None) return ret -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via e2710d3 Remove patching for bitfield
via a187aee Add -g for Sernet-solaris8
via ccee335 Add -g for sunX
from 1d47f19 ... and commit the right file
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit e2710d3f8dd7dd917db5d25c646560c6e37f9e00
Author: Matthieu Patou m...@matws.net
Date: Wed Dec 8 00:06:30 2010 +0300
Remove patching for bitfield
commit a187aeec03203e7e5a2a11ccdd2e5066eb539efe
Author: Matthieu Patou m...@matws.net
Date: Mon Nov 29 00:38:05 2010 +0300
Add -g for Sernet-solaris8
commit ccee33549fc9d1cd4345cf9ad3d6a65d272ba291
Author: Matthieu Patou m...@matws.net
Date: Mon Nov 29 00:33:20 2010 +0300
Add -g for sunX
---
Summary of changes:
SerNet-solaris8.fns |3 ++-
sunX.fns|2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 1fc220d..a652f2a 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -19,13 +19,14 @@ prehook_configure()
{
case $tree in
samba_4*)
- (cd ${builddir}/..; gpatch -p 1 $HOME/build_farm/patch)
;;
*)
;;
esac
}
+CFLAGS=-g $CFLAGS
+export CFLAGS
compilers=cc gcc
for compiler in $compilers; do
diff --git a/sunX.fns b/sunX.fns
index 60ff7f6..c982ffd 100644
--- a/sunX.fns
+++ b/sunX.fns
@@ -7,6 +7,8 @@ TORTURE_MAXTIME=3600
SMBD_MAXTIME=42200
SAMBA_MAXTIME=42200
export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
+CFLAGS=-g $CFLAGS
+export CFLAGS
compilers=cc gcc
for compiler in $compilers; do
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via fb9c5e0 delete unneeded SerNet-imini.fns to eliminate duplicate compile runs from e2710d3 Remove patching for bitfield http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit fb9c5e016a6b58654b86282ae2b0f11384d0f02b Author: Björn Jacke b...@sernet.de Date: Tue Dec 7 23:40:57 2010 +0100 delete unneeded SerNet-imini.fns to eliminate duplicate compile runs --- Summary of changes: SerNet-imini.fns | 17 - 1 files changed, 0 insertions(+), 17 deletions(-) delete mode 100644 SerNet-imini.fns Changeset truncated at 500 lines: diff --git a/SerNet-imini.fns b/SerNet-imini.fns deleted file mode 100644 index fee132f..000 --- a/SerNet-imini.fns +++ /dev/null @@ -1,17 +0,0 @@ -per_run_hook - -global_lock - -compilers=gcc cc - -for compiler in $compilers; do - . common.fns - - test_tree samba_4_0_test source4 $compiler - - test_tree samba_3_current source $compiler - test_tree samba_3_next source $compiler - test_tree samba_3_master source $compiler -done - -global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 58c09d2 reintroduce specific host file for tru64, in order to remove CPPFLAGS for S4 from fb9c5e0 delete unneeded SerNet-imini.fns to eliminate duplicate compile runs http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 58c09d20afafafb18b2016d7bca2cbe6f0ed143b Author: Matthieu Patou m...@matws.net Date: Wed Dec 8 02:27:10 2010 +0300 reintroduce specific host file for tru64, in order to remove CPPFLAGS for S4 --- Summary of changes: SerNet-Tru64.fns | 30 -- 1 files changed, 28 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns index 629747d..37a5540 100644 --- a/SerNet-Tru64.fns +++ b/SerNet-Tru64.fns @@ -1,8 +1,34 @@ -compilers=cc +per_run_hook + +global_lock +compilers=cc MAXTIME=18000 SMBD_MAXTIME=8500 SAMBA_MAXTIME=8500 export MAXTIME SMBD_MAXTIME SAMBA_MAXTIME -. generic.fns +CFLAGS=-g $CFLAGS +export CFLAGS + +for compiler in $compilers; do + + . common.fns + TDB_NO_FSYNC=1 + SAVED_CPPFLAGS=$CPPFLAGS + CPPFLAGS= + export TDB_NO_FSYNC + export CPPFLAGS + test_tree samba_4_0_test source4 $compiler + CPPFLAGS=$SAVED_CPPFLAGS + export CPPFLAGS + + test_tree samba_3_current source $compiler + test_tree samba_3_next source $compiler + test_tree samba_3_master source $compiler + TDB_NO_FSYNC=0 + export TDB_NO_FSYNC + +done + +global_unlock -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via f9d4536 Don't create subunit files on disk, rather just extract them out of the master file. from 3c95928 Fix typo. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit f9d45362e4024ee9c635b88d64a2245e006493c9 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 4 15:54:23 2010 +0100 Don't create subunit files on disk, rather just extract them out of the master file. --- Summary of changes: buildfarm/build.py | 15 +-- tools/fix.py | 15 --- 2 files changed, 1 insertions(+), 29 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/build.py b/buildfarm/build.py index 4108ac0..e5993ef 100644 --- a/buildfarm/build.py +++ b/buildfarm/build.py @@ -329,10 +329,7 @@ class Build(object): def read_subunit(self): read the test output as subunit -try: -return open_opt_compressed_file(self.basename+.subunit) -except IOError: -raise NoTestOutput() +return StringIO(.join(extract_test_output(self.read_log( def read_log(self): read full log file @@ -549,16 +546,6 @@ class BuildResultStore(object): os.link(build.basename+.log, new_basename+.log) if os.path.exists(build.basename+.err): os.link(build.basename+.err, new_basename+.err) -try: -subunit_output = extract_test_output(build.read_log()) -except NoTestOutput: -pass -else: -f = bz2.BZ2File(new_basename+.subunit.bz2, 'w') -try: -f.writelines(subunit_output) -finally: -f.close() new_build = StormBuild(new_basename, build.tree, build.host, build.compiler, rev) new_build.checksum = build.log_checksum() diff --git a/tools/fix.py b/tools/fix.py index b02782c..272e16d 100755 --- a/tools/fix.py +++ b/tools/fix.py @@ -62,19 +62,4 @@ for build in store.find(StormBuild, StormBuild.host_id == None): print Unable to find host %s % e.name -for build in store.find(StormBuild, StormBuild.basename != None): -subunit_path = build.basename + .subunit -if os.path.exists(subunit_path) or os.path.exists(subunit_path+.bz2): -continue -try: -test_output = .join(extract_test_output(build.read_log())) -except (LogFileMissing, NoTestOutput): -continue -print Writing subunit file for %r % build -f = bz2.BZ2File(subunit_path+.bz2, 'w') -try: -f.write(test_output) -finally: -f.close() - buildfarm.commit() -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via bba2790 fix test: =: unary operator expected error as one of the
vars could be empty?
from 73098e8 generic.fns: fix duplicate compiler detection
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit bba2790f0582fa968e590c54079a750279d9aff7
Author: Björn Jacke b...@sernet.de
Date: Fri Dec 3 12:13:07 2010 +0100
fix test: =: unary operator expected error as one of the vars could be
empty?
---
Summary of changes:
build_test.fns |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index 9717770..b7649bd 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -197,7 +197,7 @@ lock_file() {
fi
if test -f $lckf; then
- test $machine = $host || {
+ test x$machine = x$host || {
echo lock file $lckf is valid for other
machine $machine
return 1
}
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via a0c2c75 Merge StormCachingBuildFarm and BuildFarm. via c169c3b Kill StormCachingBuildFarm - regular build farm now uses Storm. via f708032 Kill 'plain' old revision database. via 262c55c Fix a bunch of tests. via 1922c25 Add testrepository configuration. via de73273 Add test_suite function. via 198a037 Use convenience function for finding duplicate builds. via 048eb62 Remove the no longer used broken_repo script. via d3b7257 Add get_by_checksum function. via 60fd7c7 Simplify code a bit. from bba2790 fix test: =: unary operator expected error as one of the vars could be empty? http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit a0c2c7539958dbdeed5c3dbc36f0f08ba47a09a9 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 4 01:13:20 2010 +0100 Merge StormCachingBuildFarm and BuildFarm. commit c169c3bb130981055d324fb138a4037f773b6d05 Author: Jelmer Vernooij jel...@samba.org Date: Sat Dec 4 00:00:03 2010 +0100 Kill StormCachingBuildFarm - regular build farm now uses Storm. commit f708032e620fb4a2500ffc085449e4c699b184f1 Author: Jelmer Vernooij jel...@samba.org Date: Fri Dec 3 23:32:06 2010 +0100 Kill 'plain' old revision database. commit 262c55c440aca77d36959fc97271a5ee3b816e1a Author: Jelmer Vernooij jel...@samba.org Date: Fri Dec 3 23:04:36 2010 +0100 Fix a bunch of tests. commit 1922c25adaea9708dee885dec635fdc4f9cd35df Author: Jelmer Vernooij jel...@samba.org Date: Fri Dec 3 15:27:29 2010 +0100 Add testrepository configuration. commit de73273f59d9d45114f5bdead553a6a99cc2e812 Author: Jelmer Vernooij jel...@samba.org Date: Fri Dec 3 15:25:20 2010 +0100 Add test_suite function. commit 198a0378a43c966698b41f8e7a9ae1187d470f4b Author: Jelmer Vernooij jel...@samba.org Date: Fri Dec 3 14:28:29 2010 +0100 Use convenience function for finding duplicate builds. commit 048eb62b7d28b18c202230e8bae9ace1d4770bca Author: Jelmer Vernooij jel...@samba.org Date: Wed Dec 1 17:41:57 2010 +0100 Remove the no longer used broken_repo script. commit d3b7257f162f8a87812aff251deb6ac4f17e1583 Author: Jelmer Vernooij jel...@samba.org Date: Tue Nov 30 12:37:57 2010 +0100 Add get_by_checksum function. commit 60fd7c7417608fd588c482505adc8b002c4bba5d Author: Jelmer Vernooij jel...@samba.org Date: Tue Nov 30 12:37:34 2010 +0100 Simplify code a bit. --- Summary of changes: .bzrignore|1 + .testr.conf |3 + admin.py |4 +- broken_report.sh | 158 --- buildfarm/__init__.py | 84 +++-- buildfarm/build.py| 151 -- buildfarm/hostdb.py | 28 -- buildfarm/sqldb.py| 185 + buildfarm/tests/__init__.py | 33 +-- buildfarm/tests/test_build.py | 44 ++ buildfarm/tests/test_buildfarm.py | 18 ++-- buildfarm/tests/test_sqldb.py | 41 + buildfarm/web/__init__.py |4 +- builds.py |4 +- import-and-analyse.py |7 +- mail-dead-hosts.py|4 +- tools/fix.py |4 +- 17 files changed, 242 insertions(+), 531 deletions(-) create mode 100644 .testr.conf delete mode 100755 broken_report.sh Changeset truncated at 500 lines: diff --git a/.bzrignore b/.bzrignore index 23886d3..c5987b3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,3 +1,4 @@ _trial_temp db data +.testrepository diff --git a/.testr.conf b/.testr.conf new file mode 100644 index 000..8465f49 --- /dev/null +++ b/.testr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_command=PYTHONPATH=. python -m subunit.run $IDLIST +test_id_list_default=buildfarm.tests.test_suite diff --git a/admin.py b/admin.py index 07c0164..60679f8 100755 --- a/admin.py +++ b/admin.py @@ -18,9 +18,9 @@ # from buildfarm import ( +BuildFarm, hostdb, ) -from buildfarm.sqldb import StormCachingBuildFarm import commands import os import smtplib @@ -28,7 +28,7 @@ import sys import time from email.MIMEText import MIMEText -buildfarm = StormCachingBuildFarm() +buildfarm = BuildFarm() def update_rsyncd_secrets(): temp_rsyncd_secrets = os.path.join(os.path.dirname(__file__), ../rsyncd.secrets.new) diff --git a/broken_report.sh b/broken_report.sh deleted file mode 100755 index 05ea471..000 --- a/broken_report.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash -# This shell script produces an email comparing current broken status -# to that of the last run of this script -# -# Copyright (C) Vance Lankhaar va...@samba.org 2005 -# -#
