triggers/common: inline triggers/trigger_wb_update_*

diff --git a/triggers/common b/triggers/common
index 94a7eb6d0a6b4e2ff500c3496834065126fbcf04..a31c7ce48e101c657a7d9490c48770a21d728d89 100644 (file)
--- a/triggers/common
+++ b/triggers/common
@@ -109,10 +109,10 @@ trigger_wb_update() {
     echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
 
     new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
-    parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS} || true
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_arch_loop "${SUITE}" "${ARCH}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}"
-    #done
+    for ARCH in ${ARCHS}; do
+        new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}
+    done
+    parallel -l 5 -i wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch="{}" --dist=$WB_SUITE Packages.%SUITE%.%ARCH% . Sources.%SUITE% -- ${ARCHS} || true
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
@@ -136,11 +136,12 @@ trigger_wb_update_for_overlay() {
 
     new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
     new-keep-latest source $(eval echo Sources.${SUITE} ${SOURCES_BASE}) > Sources.${SUITE}-all
-
-    parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_for_overlay_arch_loop "${SUITE}" "${ARCH}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
-    #done
+    for ARCH in ${ARCHS}; do
+        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
+    done
+    parallel -l 5 -i wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch="{}" --dist=$WB_SUITE Packages.%SUITE%.%ARCH% . Sources.%SUITE% . \
+        Packages.%SUITE%.%ARCH%-all . Sources.%SUITE%-all -- ${ARCHS} || true
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
@@ -168,11 +169,28 @@ trigger_wb_update_with_secondary() {
 
     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} || true
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
-    #done
+    for ARCH in ${ARCHS}; do
+        new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}
+        ucat Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}-all
+    done
+    parallel -l 5 -i wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch="{}" --dist=$WB_SUITE Packages.%SUITE%.%ARCH% . Sources.%SUITE% . \
+        Packages.%SUITE%.%ARCH%-all -- ${ARCHS} || true
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
 
+ucat() {
+    for FILE in $*; do
+        case $FILE in
+            *.gz)
+                zcat $FILE
+                ;;
+            *.bz2)
+                bzcat $FILE
+                ;;
+            *)
+                cat $FILE
+                ;;
+        esac
+    done
+}

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

diff --git a/triggers/trigger_wb_update_arch_loop_with_secondary b/triggers/trigger_wb_update_arch_loop_with_secondary
deleted file mode 100755 (executable)
index 9874882..0000000
--- a/triggers/trigger_wb_update_arch_loop_with_secondary
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-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}
-rm Packages.${SUITE}.${ARCH}-all
-for FILE in Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')); do
-       case $FILE in
-               *.gz)
-                       gzip -dc < $FILE >> Packages.${SUITE}.${ARCH}-all
-                       ;;
-               *)   
-                       cat < $FILE >> Packages.${SUITE}.${ARCH}-all
-                       ;;
-       esac
-done
-do_quinn ${SUITE} ${ARCH} "${WHITELIST_FILE}"
-do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE} secondary
-

diff --git a/triggers/trigger_wb_update_for_overlay_arch_loop b/triggers/trigger_wb_update_for_overlay_arch_loop
deleted file mode 100755 (executable)
index 2e328ad..0000000
--- a/triggers/trigger_wb_update_for_overlay_arch_loop
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -eE
-
-. /org/wanna-build/triggers/common
-
-SUITE="$1"
-ARCH="$2"
-SOURCES_BASE="$3"
-PACKAGES_BASE="$4"
-SOURCES="$5"
-PACKAGES="$6"
-WB_SUITE="$7"
-WHITELIST_FILE="$8"
-
-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} overlay
-