buildd

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index 9bc417b7bb91918fa45594847bb7d42220cda979..38d95616fb90364db5c7ebe3cfb1fc4131bd17b9 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -25,42 +25,29 @@ function debug () {
     fi
 }
 
+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
+    fi
+}
+
 # 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 6070D3A1 --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 -v buildd
 
-# 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"
-    done
+    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
 }
 
 # Do the unchecked processing, in case we have files.
@@ -73,7 +60,7 @@ 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
 }
 
 function sync_debbugs () {