X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=f3cdaaa35d517648dbb8a683be5504a31bed2b4d;hb=20b783194b6b872d47717f4a9dd66b6bef7703c0;hp=599f8dc55a02c517cfc3e39852a253b9c1161064;hpb=0dfcad8b764f61ff359a426bc9f7be966e5f6d9f;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 599f8dc5..f3cdaaa3 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
 }
 
@@ -25,44 +23,100 @@ function debug () {
     fi
 }
 
+function wbtrigger() {
+    SSHOPT="-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
+    fi
+    rm -f "${LOCK_BUILDD}"
+}
+
 # used by cron.dinstall *and* cron.unchecked.
 function make_buildd_dir () {
-	cd $configdir
-	apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
-
-	cd  ${incoming}
-	rm -f buildd/Release*
-	apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release
-	gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release
-	mv Release* buildd/.
-
-	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
-}
+    dak manage-build-queues -a
+    dak generate-packages-sources2 -a build-queues
+    dak generate-releases -a build-queues >/dev/null
+
+    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 >Packages.gz
+        apt-ftparchive sources . $overridedir/override.sid.all3 >Sources
+        gzip -9c --rsyncable <Sources >Sources.gz
 
-# move accepted NEW packages from stagedir into queue/accepted
-function acceptnew () {
-    cd $newstage
-    for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do
-        sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \
-            | while read notused1 notused2 notused3 notused4 NAME; do
-            if [ -z "${NAME}" ]; then
-                # Sometimes there is a newline after the Files:, ignore it
-                continue
-            fi
-            if [ -f "${NAME}" ]; then
-                mv --target-directory="${accepted}" "${NAME}"
-            else
-                log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
-            fi
-        done
-        mv --target-directory="${accepted}"  "${file}" "${file%%.changes}.dak"
+        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")}
+
+    local exportdir="${queuedir}${qdir}/tree/${STAMP}"
+    local targetdir="${queuedir}${qdir}/export"
+    dak export -q "${queue}" -d "${exportdir}" --all
+    ln -sfT ${targetdir} ${exportdir}
+    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.
 function do_unchecked () {
     cd $unchecked
@@ -73,12 +127,25 @@ function do_unchecked () {
     UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""}
 
     echo "$timestamp": ${changes:-"Nothing to do"}  >> $report
-    dak process-unchecked -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
+    dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -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)
@@ -87,3 +154,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)
+}