Merge lp:~rbalint/britney/britney1-ubuntu-hints-from-git into lp:~ubuntu-release/britney/britney1-ubuntu

Proposed by Balint Reczey
Status: Merged
Merged at revision: 344
Proposed branch: lp:~rbalint/britney/britney1-ubuntu-hints-from-git
Merge into: lp:~ubuntu-release/britney/britney1-ubuntu
Diff against target: 52 lines (+17/-20)
1 file modified
britney (+17/-20)
To merge this branch: bzr merge lp:~rbalint/britney/britney1-ubuntu-hints-from-git
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Ubuntu Release Team Pending
Review via email: mp+386856@code.launchpad.net

Description of the change

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

This appears to require atomic replacement of all the bzr branches (devel owned by ubuntu-release, stable releases owned by ubuntu-sru) prior to making this change, since it supports only git and not bzr at all as a fallback. Are you prepared to migrate all the branches at the same time?

review: Needs Information
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
Revision history for this message
Balint Reczey (rbalint) wrote :

Yes, it is just a matter of freezing the bzr branches and having someone available to do the changes in the live infrastructure after the git branches are converted and put to their final place.

Revision history for this message
Balint Reczey (rbalint) wrote :

The change became conflicting due to changes in the target branch, fixing that.

Revision history for this message
Steve Langasek (vorlon) :
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 2020-07-30 08:37:36 +0000
3+++ britney 2020-08-03 11:03:21 +0000
4@@ -333,32 +333,29 @@
5
6 make_hints_branch () {
7 if [ -d "$1" ]; then
8- bzr pull -q -d "$1" --remember --overwrite "$2"
9+ (cd "$1"
10+ git remote remove origin || true
11+ git remote add origin "$2"
12+ git fetch origin -q
13+ if git branch -q -D "$3"; then
14+ git checkout --force --track -b "$3" "origin/$3"
15+ else
16+ git reset --hard "origin/$3"
17+ fi)
18 else
19- bzr branch "$2" "$1"
20+ git clone -b "$3" "$2" "$1"
21 fi
22 }
23
24-if option hints_bzr; then
25- echo HINTS_BZR:
26+if option hints_git; then
27+ echo HINTS_GIT:
28 if [ "$DISTRIBUTION" = ubuntu ]; then
29 if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
30- branch="lp:~ubuntu-release/britney/hints-ubuntu"
31- else
32- branch="lp:~ubuntu-sru/britney/hints-ubuntu-$SERIES"
33- fi
34- make_hints_branch "$DATA_B2/$SERIES-proposed/Hints" "$branch"
35- if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
36- make_hints_branch \
37- "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch" \
38- "lp:~ubuntu-touch-release/britney/hints-ubuntu-touch"
39- else
40- rm -rf "$DATA_B2/$SERIES-proposed/Hints/ubuntu-touch"
41- fi
42- elif [ "$DISTRIBUTION" = ubuntu-rtm ]; then
43- make_hints_branch \
44- "$DATA_B2/$SERIES-proposed/Hints" \
45- lp:~ubuntu-release/britney/hints-ubuntu-rtm
46+ branch="ubuntu/devel"
47+ else
48+ branch="ubuntu/$SERIES"
49+ fi
50+ make_hints_branch "$DATA_B2/$SERIES-proposed/Hints" "https://git.launchpad.net/~ubuntu-release/britney/+git/hints-ubuntu" "$branch"
51 fi
52 fi
53

Subscribers

People subscribed via source and target branches