Merge lp:~cjwatson/britney/dynamic-arches into lp:~ubuntu-release/britney/britney1-ubuntu

[Colin Watson]

Generate the britney2 configuration file dynamically, with series-appropriate architecture lists.

Generate the britney2 configuration file dynamically, with series-appropriate architecture lists.

This is needed to run for precise, which had a different set of architectures.

[Iain Lane (laney)]

review: Approve

=== modified file 'britney'
--- britney	2015-02-19 12:56:42 +0000
+++ britney	2015-02-20 15:36:49 +0000
@@ -90,7 +90,7 @@
 
 #eval $( dak admin config db-shell )
 
-suite_arches () {
+suite_info () {
     python -c '
 from __future__ import print_function
 
@@ -115,8 +115,15 @@
 distro = launchpad.distributions[sys.argv[2]]
 series_name = sys.argv[3].split("-")[0]
 series = distro.getSeries(name_or_version=series_name)
-print(" ".join(arch.architecture_tag for arch in series.architectures))
-' "$LP_SERVICE" "$DISTRIBUTION" "$1"
+'"$1" "$LP_SERVICE" "$DISTRIBUTION" "$2"
+}
+
+suite_arches () {
+    suite_info 'print(" ".join(arch.architecture_tag for arch in series.architectures))' "$1"
+}
+
+suite_archindep () {
+    suite_info 'print(series.nominatedarchindep.architecture_tag)' "$1"
 }
 
 if ! qoption allowdaklock; then
@@ -352,9 +359,19 @@
     -a "Reply-To: [e-mail]" [e-mail]
 }
 
+make_b2_config () {
+    local arches archindep
+    arches=`suite_arches $SERIES`
+    archindep=`suite_archindep $SERIES`
+    sed -e "s/^\\(ARCHITECTURES  *= \\).*/\\1$arches/" \
+        -e "s/^\\(NOBREAKALL_ARCHES  *= \\).*/\\1$archindep/" \
+        "$1" >"$2"
+}
+
 run_b2 () {
   cd $BASE
-  $CODE_B2/britney.py -c $B2_CONFIG -v --distribution=$DISTRIBUTION --series=$SERIES
+  make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
+  $CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES" -v --distribution=$DISTRIBUTION --series=$SERIES
 }
 
 if option run; then
@@ -439,8 +456,10 @@
 
   # TODO: {stable,unstable}_uninst.txt -- needs support in b2, talk to Fabio
   # TODO: this creates uninstallability reports against b2 results, not b1's
-  create_uninst_report $B2_CONFIG ${SERIES}_uninst.txt
-  create_uninst_report $B2_CONFIG_NOBREAKALL ${SERIES}_uninst_full.txt
+  make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
+  make_b2_config "$B2_CONFIG_NOBREAKALL" "$B2_CONFIG_NOBREAKALL.$DISTRIBUTION.$SERIES"
+  create_uninst_report "$B2_CONFIG.$DISTRIBUTION.$SERIES" ${SERIES}_uninst.txt
+  create_uninst_report "$B2_CONFIG_NOBREAKALL.$DISTRIBUTION.$SERIES" ${SERIES}_uninst_full.txt
 
   #if grep -q -e '-meta-faux' $HTML/testing_uninst.txt; then
   #  echo >&2 'Warning! Some -meta-faux package is uninstallable!'