X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=bb6f8e4a0b28465dca9031f8e70248a9aa613c7a;hb=1a24585c805c924e25f567c8da728402d95a5cc8;hp=be4e54371fff86b77ebaeb8b7bc29ed24f797dd3;hpb=ed9782ad5afa4dce73ce88d412e38182329a21ad;p=dak.git diff --git a/config/debian/common b/config/debian/common index be4e5437..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,74 +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 - - for suite in unstable experimental; do - rm -rf "$incoming/dists/$suite/buildd" - dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd" - done - rm -f ${incoming}/public/* - dak export-suite -s "accepted" -d "$incoming/public" - - # export to old build queue directories - # XXX: Remove once the buildds use the version generated above. - for suite in $(ls -1 $incoming/dists/); do - # Skip project trace directory - if [ "${suite}x" = "projectx" ]; then continue; fi - cd ${incoming}/dists/${suite}/buildd - - apt-ftparchive packages . $overridedir/override.sid.all3 >Packages - gzip -9c --rsyncable Packages.gz - apt-ftparchive sources . $overridedir/override.sid.all3 >Sources - gzip -9c --rsyncable Sources.gz - - rm -f buildd/Release - cd .. - apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release - if [ "$suite" = "experimental" ]; then - echo "NotAutomatic: yes" >>Release - fi - - gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release + dak generate-releases -a build-queues >/dev/null - mv Release Release.gpg buildd/ - done + # Stick a last modified date in the page footer + echo "

Last updated: `date -u`

" > ${incoming}/web/README.html - for dist in $(ls -1 ${incoming}/dists/); do - # Skip project trace directory - if [ "${dist}x" = "projectx" ]; then continue; fi - cd ${incoming}/dists/${dist} - mkdir -p tree/${STAMP} - cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ - ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current - find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf - done + # 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 "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" 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}" - local exportdir="${queuedir}/${qdir}/export" - rm -rf "${exportdir}" + 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 @@ -100,7 +73,7 @@ function punew() { log "Doing automated p-u-new processing" fi cd "${queuedir}/p-u-new" - punew_do "$1" "p-u-new" + punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org" } function opunew() { @@ -108,7 +81,20 @@ function opunew() { log "Doing automated o-p-u-new processing" fi cd "${queuedir}/o-p-u-new" - punew_do "$1" "o-p-u-new" + 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. @@ -122,6 +108,7 @@ 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 } # process NEW policy queue @@ -129,8 +116,11 @@ 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" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org - dak clean-suites -a new + (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 + + 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 + + dak clean-suites -a new,backports-new } function sync_debbugs () { @@ -140,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 )) @@ -159,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() { @@ -172,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}" +}