X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=bb6f8e4a0b28465dca9031f8e70248a9aa613c7a;hb=520cc894834d0bf90b409bca8db8ad428d273582;hp=1d04fd23238b0e83b16577bba4e6fec0c19120cc;hpb=58fc1503ab1484b42e66a93155441634eff6e604;p=dak.git diff --git a/config/debian/common b/config/debian/common index 1d04fd23..bb6f8e4a 100644 --- a/config/debian/common +++ b/config/debian/common @@ -12,7 +12,7 @@ function log () { function log_error () { log "$@" if [ -z "${MAILTO}" ]; then - echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO} -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" -a "From: Debian FTP Masters " ${MAILTO} fi } @@ -24,23 +24,47 @@ function debug () { } function wbtrigger() { - SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" + SSHOPT="-n -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then - ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often + ssh -q -q ${SSHOPT} wbadm@buildd /srv/wanna-build/trigger.often fi rm -f "${LOCK_BUILDD}" } # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { + # We generate straight into the static mirror location for incoming dak manage-build-queues -a + dak generate-packages-sources2 -a build-queues + dak generate-releases -a build-queues >/dev/null + + # Stick a last modified date in the page footer + echo "

Last updated: `date -u`

" > ${incoming}/web/README.html + + # Tell the mirrors that we've updated + chronic /usr/local/bin/static-update-component incoming.debian.org } # Process (oldstable)-proposed-updates "NEW" queue function punew_do() { + local queue="$1" + local qdir="$2" + local to="${3}" + date -u -R >> REPORT - dak process-policy $1 | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in $1" debian-release@lists.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" -a "From: Debian FTP Masters " "${to}" echo >> REPORT + + dak generate-packages-sources2 -s "${queue}" + + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} + + local exportdir="${qdir}/tree/${STAMP}" + local targetdir="${qdir}/export" + mkdir -p -- ${exportdir} + dak export -q "${queue}" -d "${exportdir}" --all + ln -sfT ${exportdir} ${targetdir} + find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf } # These versions used in dinstall @@ -49,7 +73,7 @@ function punew() { log "Doing automated p-u-new processing" fi cd "${queuedir}/p-u-new" - punew_do "$1" + punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org" } function opunew() { @@ -57,7 +81,20 @@ function opunew() { log "Doing automated o-p-u-new processing" fi cd "${queuedir}/o-p-u-new" - punew_do "$1" + punew_do "$1" "${queuedir}/o-p-u-new" "debian-release@lists.debian.org" +} + +function backports_policy() { + local queue="backports-policy" + local qdir="/srv/backports-master.debian.org/queue/policy" + local to="backports-team@debian.org" + + if [ "${PROGRAM}" = "dinstall" ]; then + log "Doing automated ${queue} processing" + fi + + cd "${qdir}" + punew_do "${queue}" "${qdir}" "${to}" } # Do the unchecked processing, in case we have files. @@ -71,19 +108,19 @@ function do_unchecked () { echo "$timestamp": ${changes:-"Nothing to do"} >> $report dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report + dak process-commands -d "$unchecked" >> $report } -# Do the newstage processing, in case we have files. -function do_newstage () { - cd $newstage +# process NEW policy queue +function do_new () { + if [ "${PROGRAM}" = "dinstall" ]; then + log "Doing NEW processing" + fi + (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org - changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) - report=$queuedir/REPORT - timestamp=$(date "+%Y-%m-%d %H:%M") - UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""} + dak process-policy backports-new | mail -a "X-Debian: DAK" -e -s "NEW processing for backports-new" -a "From: Debian FTP Masters " backports-team@debian.org - echo "$timestamp": ${changes:-"Nothing to do in newstage"} >> $report - dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$newstage" >> $report + dak clean-suites -a new,backports-new } function sync_debbugs () { @@ -93,7 +130,7 @@ function sync_debbugs () { mkdir -p $queuedir/bts_version_track_archive/${timestamp} rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp} rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${timestamp} # remove if empty. - rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true + rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/srv/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true NOW=$(date +%s) TSTAMP=$(stat -c %Y $lockdir/synced_bts_version) DIFF=$(( NOW - TSTAMP )) @@ -112,12 +149,13 @@ function clean_debbugs () { function reports() { # Send a report on NEW/BYHAND packages log "Nagging ftpteam about NEW/BYHAND packages" - dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org + dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" -a "From: Debian FTP Masters " backports-team@debian.org # and one on crufty packages log "Sending information about crufty packages" dak cruft-report -R > $webdir/cruft-report-daily.txt dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt - cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org } function pg_timestamp() { @@ -125,3 +163,14 @@ function pg_timestamp() { log "Saving postgres transaction id for ${tsname}" psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S) } + +function get_archiveroot() { + local archivename="$1" + local query="SELECT path FROM archive WHERE name='${archivename}'" + local archiveroot="$(psql -tAc "${query}")" + if [ -z "${archiveroot}" ]; then + echo "get_archiveroot: couldn't get archiveroot for '${archivename}'" >&2 + return 1 + fi + echo "${archiveroot}" +}