X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=d5776af147aadc9d327d91bfceb613a19bc5fce1;hb=425e44739cd77ffa01294f23e94ae7eabd5f5ec8;hp=045b6a04a6b0683f36cf84951a1d6a02c8ebf370;hpb=2881a67e116449cd49495faad6c3152cdab8fbb7;p=dak.git diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 045b6a04..d5776af1 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -235,6 +235,12 @@ function buildd() { apt-ftparchive generate apt.conf.buildd } +function buildd_dir() { + # Rebuilt the buildd dir to avoid long times of 403 + log "Regenerating the buildd incoming dir" + make_buildd_dir +} + function scripts() { log "Running various scripts from $scriptsdir" cd $scriptsdir @@ -289,6 +295,12 @@ function merkel2() { ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb dak@merkel.debian.org sleep 1 } +function merkel3() { + # Push dak@merkel to tell it to sync the dd accessible parts. Returns immediately, the sync runs detached + log "Trigger merkels dd accessible parts sync" + ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_ddaccess dak@merkel.debian.org sleep 1 +} + function runparts() { log "Using run-parts to run scripts in $base/scripts/distmnt" run-parts --report $base/scripts/distmnt @@ -579,6 +591,14 @@ GO=( ) stage $GO +GO=( + FUNC="buildd_dir" + TIME="buildd_dir" + ARGS="" + ERR="false" +) +stage $GO + GO=( FUNC="cruft" TIME="cruft" @@ -788,6 +808,14 @@ GO=( ) stage $GO +GO=( + FUNC="merkel3" + TIME="merkel ddaccessible sync" + ARGS="" + ERR="false" +) +stage $GO + GO=( FUNC="compress" TIME="compress"