britney

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

  1. dynamic-arches
  2. Merge into britney1-ubuntu
Proposed by Colin Watson
Status: Merged
Merged at revision: 279
Proposed branch: lp:~cjwatson/britney/dynamic-arches
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 64 lines (+25/-6)
1 file modified
britney (+25/-6)
To merge this branch: bzr merge lp:~cjwatson/britney/dynamic-arches
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+250462@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'britney'
--- britney 2015-02-19 12:56:42 +0000
+++ britney 2015-02-20 15:36:49 +0000
@@ -90,7 +90,7 @@
9090
91#eval $( dak admin config db-shell )91#eval $( dak admin config db-shell )
9292
93suite_arches () {93suite_info () {
94 python -c '94 python -c '
95from __future__ import print_function95from __future__ import print_function
9696
@@ -115,8 +115,15 @@
115distro = launchpad.distributions[sys.argv[2]]115distro = launchpad.distributions[sys.argv[2]]
116series_name = sys.argv[3].split("-")[0]116series_name = sys.argv[3].split("-")[0]
117series = distro.getSeries(name_or_version=series_name)117series = distro.getSeries(name_or_version=series_name)
118print(" ".join(arch.architecture_tag for arch in series.architectures))118'"$1" "$LP_SERVICE" "$DISTRIBUTION" "$2"
119' "$LP_SERVICE" "$DISTRIBUTION" "$1"119}
120
121suite_arches () {
122 suite_info 'print(" ".join(arch.architecture_tag for arch in series.architectures))' "$1"
123}
124
125suite_archindep () {
126 suite_info 'print(series.nominatedarchindep.architecture_tag)' "$1"
120}127}
121128
122if ! qoption allowdaklock; then129if ! qoption allowdaklock; then
@@ -352,9 +359,19 @@
352 -a "Reply-To: britney2@release.debian.org" britney2@release.debian.org359 -a "Reply-To: britney2@release.debian.org" britney2@release.debian.org
353}360}
354361
362make_b2_config () {
363 local arches archindep
364 arches=`suite_arches $SERIES`
365 archindep=`suite_archindep $SERIES`
366 sed -e "s/^\\(ARCHITECTURES *= \\).*/\\1$arches/" \
367 -e "s/^\\(NOBREAKALL_ARCHES *= \\).*/\\1$archindep/" \
368 "$1" >"$2"
369}
370
355run_b2 () {371run_b2 () {
356 cd $BASE372 cd $BASE
357 $CODE_B2/britney.py -c $B2_CONFIG -v --distribution=$DISTRIBUTION --series=$SERIES373 make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
374 $CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES" -v --distribution=$DISTRIBUTION --series=$SERIES
358}375}
359376
360if option run; then377if option run; then
@@ -439,8 +456,10 @@
439456
440 # TODO: {stable,unstable}_uninst.txt -- needs support in b2, talk to Fabio457 # TODO: {stable,unstable}_uninst.txt -- needs support in b2, talk to Fabio
441 # TODO: this creates uninstallability reports against b2 results, not b1's458 # TODO: this creates uninstallability reports against b2 results, not b1's
442 create_uninst_report $B2_CONFIG ${SERIES}_uninst.txt459 make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
443 create_uninst_report $B2_CONFIG_NOBREAKALL ${SERIES}_uninst_full.txt460 make_b2_config "$B2_CONFIG_NOBREAKALL" "$B2_CONFIG_NOBREAKALL.$DISTRIBUTION.$SERIES"
461 create_uninst_report "$B2_CONFIG.$DISTRIBUTION.$SERIES" ${SERIES}_uninst.txt
462 create_uninst_report "$B2_CONFIG_NOBREAKALL.$DISTRIBUTION.$SERIES" ${SERIES}_uninst_full.txt
444463
445 #if grep -q -e '-meta-faux' $HTML/testing_uninst.txt; then464 #if grep -q -e '-meta-faux' $HTML/testing_uninst.txt; then
446 # echo >&2 'Warning! Some -meta-faux package is uninstallable!'465 # echo >&2 'Warning! Some -meta-faux package is uninstallable!'

Subscribers

People subscribed via source and target branches