britney

Merge lp:~cjwatson/britney/sru-config into lp:~ubuntu-release/britney/britney1-ubuntu

  1. sru-config
  2. Merge into britney1-ubuntu
Proposed by Colin Watson
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~cjwatson/britney/sru-config
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 79 lines (+22/-7)
1 file modified
britney (+22/-7)
To merge this branch: bzr merge lp:~cjwatson/britney/sru-config
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+249201@code.launchpad.net

Commit message

Set up hints and blocks appropriately for runs against Ubuntu stable series.

Description of the change

Set up hints and blocks appropriately for runs against Ubuntu stable series.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'britney'
2--- britney 2014-12-10 14:55:57 +0000
3+++ britney 2015-02-10 14:21:24 +0000
4@@ -20,7 +20,8 @@
5
6 LP_SERVICE="${LP_SERVICE:-production}"
7 DISTRIBUTION="${DISTRIBUTION:-ubuntu}"
8-SERIES="${SERIES:-vivid}"
9+DEFAULT_SERIES=vivid
10+SERIES="${SERIES:-$DEFAULT_SERIES}"
11
12 # DATE
13 NOW=`date +"%F/%T" -u`
14@@ -162,7 +163,14 @@
15 fi
16
17 blocks () {
18+ local tags
19+ [ "$DISTRIBUTION" = ubuntu ] || return
20 mkdir -p "$1/$SERIES-proposed"
21+ if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
22+ tags="block-proposed block-proposed-$SERIES"
23+ else
24+ tags="block-proposed-$SERIES"
25+ fi
26 python -c '
27 from __future__ import print_function
28
29@@ -190,8 +198,8 @@
30
31 launchpad = Launchpad.login_with("proposed-migration", sys.argv[1])
32 distro = launchpad.distributions[sys.argv[2]]
33-tag = "block-proposed"
34-for task in distro.searchTasks(omit_targeted=False, tags=tag):
35+tags = sys.argv[3].split()
36+for task in distro.searchTasks(omit_targeted=False, tags=tags):
37 target = task.target
38 bug = task.bug
39 if urlsplit(target.resource_type_link).fragment in (
40@@ -200,7 +208,12 @@
41 [a for a in bug.activity if a.whatchanged == "tags"]):
42 oldtags = action.oldvalue.split()
43 newtags = action.newvalue.split()
44- if tag not in oldtags and tag in newtags:
45+ gained_block = False
46+ for tag in tags:
47+ if tag not in oldtags and tag in newtags:
48+ gained_block = True
49+ break
50+ if gained_block:
51 date = action.datechanged
52 break
53 else:
54@@ -208,7 +221,7 @@
55 print("%s %d %d" %
56 (os.path.basename(target.self_link), bug.id,
57 calendar.timegm(date.timetuple())))
58-' "$LP_SERVICE" "$DISTRIBUTION" >"$1/$SERIES-proposed/Blocks.new"
59+' "$LP_SERVICE" "$DISTRIBUTION" "$tags" >"$1/$SERIES-proposed/Blocks.new"
60 mv "$1/$SERIES-proposed/Blocks.new" "$1/$SERIES-proposed/Blocks"
61 }
62 if option blocks; then
63@@ -283,12 +296,14 @@
64 if [ "$DISTRIBUTION" = ubuntu ]; then
65 if [ -d $DATA_B2/$SERIES-proposed/Hints ]; then
66 bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints
67- else
68+ elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
69 bzr branch lp:~ubuntu-release/britney/hints-ubuntu $DATA_B2/$SERIES-proposed/Hints
70+ else
71+ bzr branch lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES $DATA_B2/$SERIES-proposed/Hints
72 fi
73 if [ -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch ]; then
74 bzr pull -q -d $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
75- else
76+ elif [ "$SERIES" = "$DEFAULT_SERIES" ]; then
77 bzr branch lp:~ubuntu-touch-release/britney/hints-ubuntu-touch $DATA_B2/$SERIES-proposed/Hints/ubuntu-touch
78 fi
79 elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then

Subscribers

People subscribed via source and target branches