Make the triggers use multiple Packages file for things like experimental.

diff --git a/triggers/common b/triggers/common
index d48cbfc5dfe7eb5bf860645e2d7d8e62eace4ea2..32ff7ac7b78d471671378f452568b42cf1f2399f 100644 (file)
--- a/triggers/common
+++ b/triggers/common
@@ -61,14 +61,21 @@ do_wb_merge_all() {
         WB_SUITE="$SUITE"
     fi
 
-    if [ "$4" != "overlay" ]
+    if [ "$4" != "overlay" && "$4" != "secondary" ]
     then
         wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \
             Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE
-    else
+    fi
+    if [ "$4" == "overlay" ]
+    then
         wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \
             Packages.$SUITE.$ARCH-all quinn-$SUITE.$ARCH Sources.$SUITE-all
     fi
+    if [ "$4" == "secondary" ]
+    then
+        wanna-build -v --merge-all-secondary --arch=$ARCH --dist=$WB_SUITE \
+            Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE Packages.$SUITE.$ARCH-all
+    fi
 }
 
 cleanup() {
@@ -134,3 +141,34 @@ trigger_wb_update_for_overlay() {
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
 
+# This is for the case where you get also get packages from
+# a secondary unrelated suite, the buildd's chroot also has
+# those packages files in it.
+# Examples are *-{volatile,backports,edu} and experimental
+# This is not for something like stable and proposed-updates
+trigger_wb_update_with_secondary() {
+    SUITE="$1"
+    ARCHS="$2"
+    PACKAGES_BASE="$3"
+    SOURCES="$4"
+    PACKAGES="$5"
+    WB_SUITE="$6"
+    WHITELIST_FILE="$7"
+
+    if [ -z "$WB_SUITE" ]
+    then
+        WB_SUITE="${SUITE}"
+    fi
+
+    echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
+
+    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
+
+    parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS}
+    #for ARCH in ${ARCHS}; do
+    #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
+    #done
+
+    echo "`date`: ${ARCHIVE}/${SUITE} done"
+}
+

diff --git a/triggers/trigger.backports b/triggers/trigger.backports
index a9d35bb3f363a3a66837170f619208564a8d28e3..96d29a781e5a50a498487a8a259756159c4539ac 100755 (executable)
--- a/triggers/trigger.backports
+++ b/triggers/trigger.backports
@@ -36,9 +36,8 @@ main() {
         base_suite=${suite%%-backports}
         SOURCES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/source/Sources.gz"
         PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
-        SOURCES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/source/Sources.gz"
         PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
-        trigger_wb_update_for_overlay "$base_suite" "`get_architectures $base_suite`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite"
+        trigger_wb_update_with_secondary "$base_suite" "`get_architectures $base_suite`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite"
     done
 
     cleanup

diff --git a/triggers/trigger.debian b/triggers/trigger.debian
index c4330064b7831de05e6008e0b452dc8702e5b267..278a489db6de44ff32c9bd379e3959edc261bb94 100755 (executable)
--- a/triggers/trigger.debian
+++ b/triggers/trigger.debian
@@ -55,12 +55,10 @@ main_sync() {
             trigger_wb_update "${SUITE}" "`get_architectures ${SUITE}`" "$SOURCES" "$PACKAGES"
         else
             BASE_SUITE=unstable
-            SOURCES_BASE="${ARCHIVE_BASE}/archive/${BASE_SUITE}/{main,contrib}/source/Sources.gz"
-            SOURCES_BASE="${SOURCES_BASE} ${ARCHIVE_BASE}/buildd-${BASE_SUITE}/Sources.gz"
             PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${BASE_SUITE}/{main,contrib}/binary-%ARCH%/Packages.gz"
             PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/archive/${BASE_SUITE}/{main,contrib}/debian-installer/binary-%ARCH%/Packages.gz"
-            PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/buildd-${BASE_SUITE}/Packages.gz"
-            trigger_wb_update_for_overlay "$SUITE" "`get_architectures $SUITE`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
+            #PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/buildd-${BASE_SUITE}/Packages.gz"
+            trigger_wb_update_with_secondary "$SUITE" "`get_architectures $SUITE`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
         fi
     done
 

diff --git a/triggers/trigger.debian-buildd b/triggers/trigger.debian-buildd
index ff398d66ceec4d4a5ab70a57a81053890093a217..e7f9980ef2c25bc2a87657dcade7d3e902f16511 100755 (executable)
--- a/triggers/trigger.debian-buildd
+++ b/triggers/trigger.debian-buildd
@@ -42,10 +42,10 @@ main() {
     PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${suite}/Packages.gz"
 
-    SOURCES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/source/Sources.gz"
     PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/archive/${base_suite}/main/debian-installer/binary-%ARCH%/Packages.gz"
-    trigger_wb_update_for_overlay "$suite" "`get_architectures $suite`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
+    #PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_MAIN}/buildd-${BASE_SUITE}/Packages.gz"
+    trigger_wb_update_with_secondary "$suite" "`get_architectures $suite`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES"
 
     cleanup
 }

diff --git a/triggers/trigger.edu b/triggers/trigger.edu
index a3f5baee7495a12ed7f26adccf3538ff13716e04..cdeec3a74a754986727c73450363e685518d8381 100755 (executable)
--- a/triggers/trigger.edu
+++ b/triggers/trigger.edu
@@ -33,11 +33,9 @@ main() {
         base_suite=$suite
         SOURCES="${ARCHIVE_BASE}/archive/${suite}-test/local/source/Sources.gz"
         PACKAGES="${ARCHIVE_BASE}/archive/${suite}-test/local/binary-%ARCH%/Packages.gz"
-        SOURCES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/source/Sources.gz"
-        SOURCES_BASE="${SOURCES_BASE} ${ARCHIVE_BASE}/archive/${suite}/local/source/Sources.gz"
         PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${base_suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
         PACKAGES_BASE="${PACKAGES_BASE} ${ARCHIVE_BASE}/archive/${suite}/local/binary-%ARCH%/Packages.gz"
-        trigger_wb_update_for_overlay "$base_suite" "$ARCHES" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-edu"
+        trigger_wb_update_with_secondary "$base_suite" "$ARCHES" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-edu"
     done
 
     cleanup

diff --git a/triggers/trigger.volatile b/triggers/trigger.volatile
index 6aab693b37380070ed5f4b01d77327c0a23e732a..7cd0a7ece3e387a45a59362093621e41a2a45abd 100755 (executable)
--- a/triggers/trigger.volatile
+++ b/triggers/trigger.volatile
@@ -39,9 +39,8 @@ main() {
         PACKAGES="${ARCHIVE_BASE}/archive/${suite}/volatile/{main,contrib}/binary-%ARCH%/Packages.gz"
         PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${suite}-proposed-updates/volatile/{main,contrib}/binary-%ARCH%/Packages.gz"
         #As volatile is an overlay, also add Debian ${suite}:
-        SOURCES_BASE="${ARCHIVE_MAIN}/archive/${suite}/{main,contrib}/source/Sources.gz"
         PACKAGES_BASE="${ARCHIVE_MAIN}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
-        trigger_wb_update_for_overlay "$suite" "`get_architectures $suite`" "$SOURCES_BASE" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-volatile"
+        trigger_wb_update_with_secondary "$suite" "`get_architectures $suite`" "$PACKAGES_BASE" "$SOURCES" "$PACKAGES" "$suite-volatile"
     done
 
     cleanup

diff --git a/triggers/trigger_wb_update_arch_loop_with_secondary b/triggers/trigger_wb_update_arch_loop_with_secondary
new file mode 100755 (executable)
index 0000000..c0d60ec
--- /dev/null
+++ b/triggers/trigger_wb_update_arch_loop_with_secondary
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+
+set -eE
+
+. /org/wanna-build/triggers/common
+
+SUITE="$1"
+ARCH="$2"
+PACKAGES_BASE="$3"
+SOURCES="$4"
+PACKAGES="$5"
+WB_SUITE="$6"
+WHITELIST_FILE="$7"
+
+new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}
+new-keep-latest ${ARCH} Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}-all
+do_quinn ${SUITE} ${ARCH} "${WHITELIST_FILE}"
+do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE} secondary
+