From e2c9e71b82bc84d98e55e2a6794b5397cf1bbc5f Mon Sep 17 00:00:00 2001 From: Andreas Barth Date: Sun, 21 Feb 2010 18:56:55 +0000 Subject: [PATCH] sync with reality (all changes from /org/wanna-build and currently live) --- bin/keep-latest | 3 +-- etc/cron/crontab | 4 ++-- etc/wanna-build.conf.local | 12 ++++++++++++ trigger.daily | 38 ++++++++------------------------------ triggers/common | 6 +++--- 5 files changed, 26 insertions(+), 37 deletions(-) diff --git a/bin/keep-latest b/bin/keep-latest index 1aedc49..788dcc5 100755 --- a/bin/keep-latest +++ b/bin/keep-latest @@ -48,9 +48,8 @@ while (<>) { $data{$key} = $_; } } - foreach (values %data) { - s/\n*$/\n\n/;# always one empty line to separate stanzas + chomp; $_ .= "\n\n"; print; } diff --git a/etc/cron/crontab b/etc/cron/crontab index eee945a..b1b9f10 100644 --- a/etc/cron/crontab +++ b/etc/cron/crontab @@ -11,8 +11,8 @@ MAILTO=cron-errors@buildd.debian.org MAILTO=adeodato@buildd.debian.org # TODO: locking -30 3,9,15,21 * * * /home/adeodato/bin/wannab-import -q ftp -7/30 * * * * /home/adeodato/bin/wannab-import -q status; /home/adeodato/code/tools/scripts/tt -q genweb +#30 3,9,15,21 * * * /home/adeodato/bin/wannab-import -q ftp +#7/30 * * * * /home/adeodato/bin/wannab-import -q status; /home/adeodato/code/tools/scripts/tt -q genweb MAILTO=cron-errors@buildd.debian.org 3 0 * * * make -sC /org/wanna-build/etc/cron check diff --git a/etc/wanna-build.conf.local b/etc/wanna-build.conf.local index ab66c05..4a9ab21 100644 --- a/etc/wanna-build.conf.local +++ b/etc/wanna-build.conf.local @@ -61,6 +61,18 @@ $quinn_source_multi_section = 0; "stable-security" => { noadw => 1, hidden => 1 }, "oldstable" => { }, "oldstable-security" => { noadw => 1, hidden => 1 }, + "experimental" => { }, + + "unstable-non-free" => { noadw => 1 }, + + "lenny-volatile" => { noadw => 1 }, + "etch-volatile" => { noadw => 1 }, + + "lenny-backports" => { }, + "etch-backports" => { }, + + "lenny-edu" => { noadw => 1 }, + "etch-edu" => { noadw => 1 }, ); # don't remove this, Perl needs it: diff --git a/trigger.daily b/trigger.daily index 3f9dc10..fa345b3 100755 --- a/trigger.daily +++ b/trigger.daily @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash # # Updates wanna-build databases after the archive maintenance # finishes @@ -10,7 +10,7 @@ LANG=C PATH="/bin:/usr/bin:/org/wanna-build/bin" #testing must be before unstable so late upld don't build for testing needlessly -DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable" +DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable experimental" # While oldstable is purged #DISTS="stable-security testing-security stable testing unstable" STATS_DISTS="unstable testing stable" @@ -39,7 +39,7 @@ cleanup() { trap cleanup 0 echo Dumping wanna-build databases... -sudo -u postgres /usr/bin/pg_dumpall --cluster 8.4/wanna-build | bzip2 > /org/wanna-build/dumps/dump_pre_$(date +%Y.%m.%d-%H:%M:%S).bz2 +save-database pre echo Updating wanna-build databases... umask 027 @@ -84,13 +84,13 @@ for d in $DISTS; do for s in $SECTIONS; do if echo $d | grep -qv -- -security; then curl_index "$MASTER/$dist/$s/source/Sources.gz" "Sources-$d.$s.gz" "Sources.$d" - if [ "$d" != "unstable" ]; then + if [ "$d" != "unstable" -a "$d" != "experimental" ]; then curl_index "$MASTER/$dist-proposed-updates/$s/source/Sources.gz" "Sources-$d-proposed-updates.$s.gz" "Sources.$d-p-u" fi for a in $ARCHS; do curl_index "$MASTER/$dist/$s/binary-$a/Packages.gz" "Packages-$d.$s.$a.gz" "Packages.$d.$a" - if [ "$d" != "unstable" ]; then + if [ "$d" != "unstable" -a "$d" != "experimental" ]; then curl_index "$MASTER/$dist-proposed-updates/$s/binary-$a/Packages.gz" "Packages-$d-proposed-updates.$s.$a.gz" "Packages.$d-p-u.$a" if [ "$d" != "oldstable" -o "$s" = "main" ]; then curl_index "$MASTER/$dist-proposed-updates/$s/debian-installer/binary-$a/Packages.gz" "Packages-$d-proposed-updates-debian-installer.$s.$a.gz" "Packages.$d-p-u.$a" @@ -145,7 +145,7 @@ for d in $DISTS; do for a in $ARCHS; do quinn-diff -A $a -a /srv/buildd.debian.org/web/quinn-diff/$dist/Packages-arch-specific -s Sources.$d -p Packages.$d.$a >> quinn-$d.$a 2>/dev/null if echo $d | grep -qv -- -security; then - if [ "$d" != "unstable" ]; then + if [ "$d" != "unstable" -a "$d" != "experimental" ]; then cat "Packages.$d.$a" >> "Packages.$d-p-u.$a" quinn-diff -A $a -a /srv/buildd.debian.org/web/quinn-diff/$dist/Packages-arch-specific -s Sources.$d-p-u -p Packages.$d-p-u.$a >> quinn-$d-p-u.$a 2>/dev/null sed -e 's/\[[-a-z]*:[-a-z]*\]$//' quinn-$d.$a > quinn-$d.$a.grep @@ -217,28 +217,6 @@ done echo "merge ended: `date`" -sudo -u postgres /usr/bin/pg_dumpall --cluster 8.4/wanna-build | bzip2 > /org/wanna-build/dumps/dump_post_$(date +%Y.%m.%d-%H:%M:%S).bz2 +save-database post +do_stats -(cd /org/wanna-build/dumps && /org/wanna-build/expire_dumps -d . -f "dump_*") - -# -# Only update stats if it's been at least 20h since the last time. -# -interval=72000 -last=`stat --format="%Y" /srv/wanna-build/etc/graph-data` -now=`date +%s` -if (( $last + $interval < $now )); then - echo "stats start: `date`" - /srv/wanna-build/bin/wb-graph >> /srv/wanna-build/etc/graph-data - /srv/wanna-build/bin/wb-graph -p >> /srv/wanna-build/etc/graph2-data - rm -f "$LOCKFILE" - trap - 0 - /srv/buildd.debian.org/bin/makegraph - for a in $ALL_ARCHES; do - echo Last Updated: `date -u` > /srv/buildd.debian.org/web/stats/$a.txt - for d in $STATS_DISTS; do - /srv/wanna-build/bin/wanna-build-statistics --database=$a/build-db --dist=$d >> /srv/buildd.debian.org/web/stats/$a.txt - done - done - echo "stats ended: `date`" -fi diff --git a/triggers/common b/triggers/common index 78fe930..2b0062f 100644 --- a/triggers/common +++ b/triggers/common @@ -107,7 +107,7 @@ trigger_wb_update() { echo "`date`: Processing ${ARCHIVE}/${SUITE} ..." new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE} - parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS} + parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS} || true #for ARCH in ${ARCHS}; do #trigger_wb_update_arch_loop "${SUITE}" "${ARCH}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" #done @@ -135,7 +135,7 @@ trigger_wb_update_for_overlay() { new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE} new-keep-latest source $(eval echo Sources.${SUITE} ${SOURCES_BASE}) > Sources.${SUITE}-all - parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} + parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true #for ARCH in ${ARCHS}; do #trigger_wb_update_for_overlay_arch_loop "${SUITE}" "${ARCH}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" #done @@ -166,7 +166,7 @@ trigger_wb_update_with_secondary() { new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE} - parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} + parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true #for ARCH in ${ARCHS}; do #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" #done -- 2.39.2