juju-release-tools

Merge lp://staging/~sinzui/juju-release-tools/deprecated-mirrors into lp://staging/juju-release-tools

  1. deprecated-mirrors
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 109
Proposed branch: lp://staging/~sinzui/juju-release-tools/deprecated-mirrors
Merge into: lp://staging/juju-release-tools
Diff against target: 148 lines (+71/-4)
2 files modified
generate_mirrors.py (+22/-2)
tests/test_generate_mirrors.py (+49/-2)
To merge this branch: bzr merge lp://staging/~sinzui/juju-release-tools/deprecated-mirrors
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+240862@code.staging.launchpad.net

Description of the change

Point the deprecated devel (and proposed) mirror data to the deprecated CPC mirror.

This branch restores the rule to point streams.canonical.com/juju/devel/tools/... to its companion path on the CPC. The rule was removed last week when we planned to switch to a single set of purposes in the /juju/tools path. But I decided to continue support the deprecated path when we found regressions in the generate-tools. I wanted the option to promote one or both. I neglected to restore this rule though.

An alpha1 tester (I know, he should be using alpha2 or 3 with support agent-stream) reported that he could not bootstrap in aws. Juju was pointed to streams.canonical.com/juju/devel/tools/, and mirrors file points "released" to real "released", not to the "released" in the devel path.

We can remove this rule when when 1.21.0 is stable.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Code looks good, I don't completely follow the reasoning behind the change.

+DEPRECATED_PATTERN = re.compile(r'.*(devel|proposed)/tools/streams/v[1-9]')

Why start '.*' when using re.search anyway?

review: Approve
lp://staging/~sinzui/juju-release-tools/deprecated-mirrors updated
112. By Curtis Hovey

Simplified DEPRECATED_PATTERN because we use search().

Revision history for this message
Curtis Hovey (sinzui) wrote :

Ah, Thank Martin. Indeed I used a wildcard with match(), then realised I wanted search(), but failed to simplify the pattern.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches