juju-ci-tools

Merge lp://staging/~sinzui/juju-ci-tools/reverse-branches into lp://staging/juju-ci-tools

  1. reverse-branches
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 1108
Proposed branch: lp://staging/~sinzui/juju-ci-tools/reverse-branches
Merge into: lp://staging/juju-ci-tools
Diff against target: 15 lines (+2/-2)
1 file modified
git-recent.bash (+2/-2)
To merge this branch: bzr merge lp://staging/~sinzui/juju-ci-tools/reverse-branches
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Aaron Bentley (community) Approve
Review via email: mp+271821@code.staging.launchpad.net

Description of the change

Reverse the listing of branches, don't sort them.

The rules to get a list of branches sorted by commit date are undermined by the use of "sort --reverse", which is a z-a sort, where we want to just reverse the listing to place the branches with the oldest commits first. The "tail -r" does what we intended to do.

We removed all the preferred branches from CI's crontab help CI test the backlog of older branches. We can see this morning that CI has been testing master and maltese-falcon. The tests are reverse alphabetical instead of old untested commits.

We can see from this listing and CI's build-revision job that environ-destruction, cli-chicago-cubs, then guibundles still needs testing.
5 minutes ago gitbranch:chicago-cubs:github.com/juju/juju
8 hours ago gitbranch:master:github.com/juju/juju
3 days ago gitbranch:1.25:github.com/juju/juju
3 days ago gitbranch:guibundles:github.com/juju/juju
3 days ago gitbranch:cli-chicago-cubs:github.com/juju/juju
3 days ago gitbranch:environ-destruction:github.com/juju/juju
4 days ago gitbranch:1.24:github.com/juju/juju
4 days ago gitbranch:use-charm.v6-unstable:github.com/juju/juju
4 days ago gitbranch:series-in-metadata:github.com/juju/juju
10 days ago gitbranch:revert-3228-038-use-charm.v6-unstable:github.com/juju/juju

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

tail: invalid option -- 'r'

I recommend "tac", which seems less likely to truncate the input.

review: Needs Fixing
lp://staging/~sinzui/juju-ci-tools/reverse-branches updated
1109. By Curtis Hovey

Use tac (gnu reverse sultion) always prune deleted refs from local repo.

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

With a little more coffee and some careful reading of
    http://stackoverflow.com/questions/5094293/git-remote-branch-deleted-but-still-appears-in-branch-a
I did indeed want tac (I ran the script in the wrong termanal, which was bsd :().

Also my local repo is listing refs to several branches that were deleted at
    https://github.com/juju/juju/branches/all
I add the "-p" to prune deleted references from the local repo when the remote has deleted it.

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

PS the new listing is
     gitbranch:maltese-falcon:github.com/juju/juju gitbranch:series-in-metadata:github.com/juju/juju gitbranch:use-charm.v6-unstable:github.com/juju/juju gitbranch:1.24:github.com/juju/juju gitbranch:environ-destruction:github.com/juju/juju gitbranch:cli-chicago-cubs:github.com/juju/juju gitbranch:guibundles:github.com/juju/juju gitbranch:1.25:github.com/juju/juju gitbranch:master:github.com/juju/juju gitbranch:chicago-cubs:github.com/juju/juju

Revision history for this message
Aaron Bentley (abentley) wrote :

Looks good.

review: Approve
Revision history for this message
Martin Packman (gz) wrote :

Looks fine.

review: Approve

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