Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 40451c8138484b5e6db55b9848909f4753e3645e..9261452daec74d7764a1ec4dcfb55719076c07be 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -172,7 +172,7 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="merkel1"
+    FUNC="qa1"
     TIME="init"
     ARGS=""
     ERR="false"
@@ -255,7 +255,7 @@ GO=(
     ARGS=""
     ERR=""
 )
-stage $GO
+#stage $GO
 
 GO=(
     FUNC="fingerprints"
@@ -288,8 +288,6 @@ GO=(
     ARGS=""
     ERR=""
 )
-# Careful: When we ever go and remove this monster-long thing, we have to check the backgrounded
-# functions before it. We no longer have a 1.5hour sync point then.
 stage $GO
 
 state "dists/"
@@ -301,6 +299,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="gitpdiff"
+    TIME="gitpdiff"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="release"
     TIME="release files"
@@ -334,14 +340,6 @@ GO=(
 )
 stage $GO
 
-GO=(
-    FUNC="mkuploaders"
-    TIME="mkuploaders"
-    ARGS=""
-    ERR=""
-)
-stage $GO
-
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -382,6 +380,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="ddaccess"
+    TIME="ddaccessible sync"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
 remove_all_locks
 trap - EXIT TERM HUP INT QUIT
 
@@ -436,14 +442,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="merkel2"
-    TIME="merkel projectb push"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="mirrorpush"
     TIME="mirrorpush"
@@ -478,14 +476,6 @@ stage $GO &
 
 rm -f "${LOCK_BRITNEY}"
 
-GO=(
-    FUNC="merkel3"
-    TIME="merkel ddaccessible sync"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="cleantransactions"
     TIME=""
@@ -500,7 +490,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+#stage $GO
 
 # we need to wait for the background processes before the end of dinstall
 wait