X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=c6f1c2d264807639807ac443e7cde307de0f5dc3;hb=f4b7c0f72e2338ac133bc096fe3f4c9fcb4b07fc;hp=d7f8e1f60c75da179635efef02da3e204e8d42f2;hpb=7d0291e11db1b2e6299cb51917a96505501bc6bc;p=dak.git diff --git a/config/debian/common b/config/debian/common index d7f8e1f6..c6f1c2d2 100644 --- a/config/debian/common +++ b/config/debian/common @@ -1,12 +1,10 @@ +# -*- mode:sh -*- # log something (basically echo it together with a timestamp) # # Set $PROGRAM to a string to have it added to the output. function log () { - if [ -z "${PROGRAM}" ]; then - echo "$(date +"%b %d %H:%M:%S") $(hostname -s) [$$] $@" - else - echo "$(date +"%b %d %H:%M:%S") $(hostname -s) ${PROGRAM}[$$]: $@" - fi + local prefix=${PROGRAM:-} + echo "$(date +"%b %d %H:%M:%S") $(hostname -s) ${prefix}[$$]: $@" } # log the message using log() but then also send a mail @@ -14,7 +12,7 @@ function log () { function log_error () { log "$@" if [ -z "${MAILTO}" ]; then - echo "$@" | mail -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO} + echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO} -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org fi } @@ -26,16 +24,9 @@ function debug () { } function wbtrigger() { - MODE=${1:-"often"} SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then - if [ "x${MODE}x" = "xdailyx" ]; then - ssh -o ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.daily || echo "W-B trigger.daily failed" | mail -s "W-B Daily trigger failed" ftpmaster@ftp-master.debian.org - elif [ "x${MODE}x" = "xoftenx" ]; then - ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often - else - log_error "Unknown wb trigger mode called" - fi + ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often fi rm -f "${LOCK_BUILDD}" } @@ -43,12 +34,88 @@ function wbtrigger() { # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { dak manage-build-queues -a + dak generate-packages-sources2 -a build-queues + dak generate-releases -a build-queues >/dev/null + ${scriptdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-buildd + + 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 + + mv Release Release.gpg buildd/ + done + + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} + + 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 +} + +# Process (oldstable)-proposed-updates "NEW" queue +function punew_do() { + local queue="$1" + local qdir="$2" + 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 + echo >> REPORT + + dak generate-packages-sources2 -s "${queue}" + + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} - cd ${incoming} - mkdir -p tree/${STAMP} - cp -al ${incoming}/buildd/. tree/${STAMP}/ - ln -sfT tree/${STAMP} ${incoming}/builddweb - find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + local exportdir="${queuedir}${qdir}/tree/${STAMP}" + local targetdir="${queuedir}${qdir}/export" + dak export -q "${queue}" -d "${exportdir}" --all + ln -sfT ${exportdir} ${targetdir} + find ${queuedir}${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 +function punew() { + if [ "${PROGRAM}" = "dinstall" ]; then + log "Doing automated p-u-new processing" + fi + cd "${queuedir}/p-u-new" + punew_do "$1" "p-u-new" +} + +function opunew() { + if [ "${PROGRAM}" = "dinstall" ]; then + log "Doing automated o-p-u-new processing" + fi + cd "${queuedir}/o-p-u-new" + punew_do "$1" "o-p-u-new" } # Do the unchecked processing, in case we have files. @@ -62,11 +129,25 @@ 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 +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 } function sync_debbugs () { # sync with debbugs echo "--" >> $report + timestamp=$(date "+%Y-%m-%d-%H:%M") + 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 NOW=$(date +%s) TSTAMP=$(stat -c %Y $lockdir/synced_bts_version) @@ -75,3 +156,27 @@ function sync_debbugs () { log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)" fi } + +function clean_debbugs () { + # Delete files older than 60 days + find $queuedir/bts_version_track_archive/ -mtime +60 -type f -delete + # Delete empty directories + find $queuedir/bts_version_track_archive/ -empty -type d -delete +} + +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 + # 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 +} + +function pg_timestamp() { + tsname=${1:-"unknown"} + log "Saving postgres transaction id for ${tsname}" + psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S) +}