Merge branch 'master' of /srv/buildd.debian.org/git/wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index 5b3afb15c92017c2ab9c8f2e527a984b08cbad8c..91d05df91f8c7c346941d69e1303a6aa0caba1f3 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -269,6 +269,15 @@ END {
        }
 }
 
+if ($distribution eq 'any-priv') {
+    $privmode = 'yes';
+    $distribution = 'any';
+}
+if ($distribution eq 'any-unpriv') {
+    $privmode = 'no';
+    $distribution = 'any';
+}
+
 my $schema_suffix = '';
 $recorduser //= (not -t and $user =~ /^buildd_/);
 if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode eq 'yes')) {
@@ -305,14 +314,6 @@ $distribution = $distribution_aliases{$distribution} if (isin($distribution, key
 $op_mode = $category ? "set-failed" : "set-building"
        if !$op_mode; # default operation
 $distribution ||= "sid";
-if ($distribution eq 'any-priv') {
-    $privmode = 'yes';
-    $distribution = 'any';
-}
-if ($distribution eq 'any-unpriv') {
-    $privmode = 'no';
-    $distribution = 'any';
-}
 undef $distribution if $distribution eq 'any';
 if ($distribution) {
     my @dists = split(/[, ]+/, $distribution);
@@ -1938,6 +1939,13 @@ sub calculate_prio {
        my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
        $pkg->{'calprio'} += $days * $scale;
 
+        my $btime = max($pkg->{'anytime'}, $pkg->{'successtime'});
+        my $bhours = defined($btime) ? int($btime/3600) : ($priomap->{'buildhours'}->{'default'} || 2);
+       $bhours = $priomap->{'buildhours'}->{'min'} if $priomap->{'buildhours'}->{'min'} and $bhours < $priomap->{'buildhours'}->{'min'};
+       $bhours = $priomap->{'buildhours'}->{'max'} if $priomap->{'buildhours'}->{'max'} and $bhours > $priomap->{'buildhours'}->{'max'};
+       $scale = $priomap->{'buildhours'}->{'scale'} || 1;
+        $pkg->{'calprio'} -= $bhours * $scale;
+
        $pkg->{'calprio'} += $pkg->{'permbuildpri'} if  $pkg->{'permbuildpri'};
        $pkg->{'calprio'} += $pkg->{'buildpri'} if  $pkg->{'buildpri'};
 

diff --git a/etc/yaml/wanna-build.yaml b/etc/yaml/wanna-build.yaml
index 9d5f24d15ba323c79277c722ab9fbf8a314a76c1..ebcb22919d9941b17d5a8ef6f3ff1dbe589663e8 100644 (file)
--- a/etc/yaml/wanna-build.yaml
+++ b/etc/yaml/wanna-build.yaml
@@ -20,6 +20,10 @@ priority:
         min: 0
         max: 6
         scale: 2
+    buildhours:
+        default: 2
+        min: 0
+        max: 15
 list-order:
     default: PScpsn
     failed: fPcpsn

diff --git a/schema/roles.sql b/schema/roles.sql
index 77ca04ca5039bd3807bdb36c2015598498a19220..3065781a6806f9344ddf7b3efea16af8956c6d30 100644 (file)
--- a/schema/roles.sql
+++ b/schema/roles.sql
@@ -71,10 +71,8 @@ CREATE ROLE white;
 CREATE ROLE wookey;
 CREATE ROLE wouter;
 CREATE ROLE zobel;
-GRANT alpha TO aloiret GRANTED BY wbadm;
 GRANT alpha TO buildd_alpha GRANTED BY wbadm;
 GRANT alpha TO kibi GRANTED BY wbadm;
-GRANT alpha TO vorlon GRANTED BY wbadm;
 GRANT alpha TO wb_all GRANTED BY wbadm;
 GRANT amd64 TO buildd_amd64 GRANTED BY wbadm;
 GRANT amd64 TO fs GRANTED BY wbadm;
@@ -87,7 +85,6 @@ GRANT arm TO colint GRANTED BY wbadm;
 GRANT arm TO riku GRANTED BY wbadm;
 GRANT arm TO wb_all GRANTED BY wbadm;
 GRANT arm TO wookey GRANTED BY wbadm;
-GRANT armel TO arm GRANTED BY wbadm;
 GRANT armel TO aurel32 GRANTED BY wbadm;
 GRANT armel TO buildd_armel GRANTED BY wbadm;
 GRANT armel TO colint GRANTED BY wbadm;
@@ -104,7 +101,6 @@ GRANT "hurd-i386" TO sthibault GRANTED BY wbadm;
 GRANT "hurd-i386" TO wb_all GRANTED BY wbadm;
 GRANT i386 TO buildd_i386 GRANTED BY wbadm;
 GRANT i386 TO kroeckx GRANTED BY wbadm;
-GRANT i386 TO luk GRANTED BY wbadm;
 GRANT i386 TO pkern GRANTED BY wbadm;
 GRANT i386 TO wb_all GRANTED BY wbadm;
 GRANT ia64 TO buildd_ia64 GRANTED BY wbadm;
@@ -118,18 +114,19 @@ GRANT "kfreebsd-i386" TO aurel32 GRANTED BY wbadm;
 GRANT "kfreebsd-i386" TO "buildd_kfreebsd-i386" GRANTED BY wbadm;
 GRANT "kfreebsd-i386" TO kibi GRANTED BY wbadm;
 GRANT "kfreebsd-i386" TO wb_all GRANTED BY wbadm;
+GRANT mips TO aba GRANTED BY wbadm;
 GRANT mips TO buildd_mips GRANTED BY wbadm;
 GRANT mips TO p2 GRANTED BY wbadm;
 GRANT mips TO wb_all GRANTED BY wbadm;
+GRANT mipsel TO aba GRANTED BY wbadm;
 GRANT mipsel TO buildd_mipsel GRANTED BY wbadm;
-GRANT mipsel TO mips GRANTED BY wbadm;
 GRANT mipsel TO wb_all GRANTED BY wbadm;
-GRANT mipsel TO zobel GRANTED BY wbadm;
 GRANT powerpc TO buildd_powerpc GRANTED BY wbadm;
 GRANT powerpc TO pkern GRANTED BY wbadm;
 GRANT powerpc TO wb_all GRANTED BY wbadm;
 GRANT powerpc TO wouter GRANTED BY wbadm;
 GRANT s390 TO buildd_s390 GRANTED BY wbadm;
+GRANT s390 TO pkern GRANTED BY wbadm;
 GRANT s390 TO waldi GRANTED BY wbadm;
 GRANT s390 TO wb_all GRANTED BY wbadm;
 GRANT sparc TO buildd_sparc GRANTED BY wbadm;
@@ -164,5 +161,4 @@ GRANT wb_security TO white GRANTED BY wbadm;
 GRANT wbadm TO aba GRANTED BY wbadm;
 GRANT wbadm TO he GRANTED BY wbadm;
 GRANT wbadm TO kroeckx GRANTED BY wbadm;
-GRANT wbadm TO luk GRANTED BY wbadm;
 GRANT wbadm TO pkern GRANTED BY wbadm;

diff --git a/schema/update-schema.sh b/schema/update-schema.sh
index 72f2230dd5c9205c6581485314e21f0876654e95..364289d9425ea7be4cb4e114108fda9d050bbc05 100755 (executable)
--- a/schema/update-schema.sh
+++ b/schema/update-schema.sh
@@ -8,5 +8,6 @@ git add wanna-build.sql
 sudo -u postgres pg_dumpall --cluster 8.4/wanna-build | egrep '^(GRANT.*TO.*BY|CREATE ROLE)' > roles.sql
 git add roles.sql
 
-git commit wanna-build.sql roles.sql -m 'Auto-committed schema changes.'
+git status >/dev/null && git commit wanna-build.sql roles.sql -m 'Auto-committed schema changes.'
+git push >/dev/null