Merge lp://staging/~sinzui/juju-release-tools/build-centos into lp://staging/juju-release-tools

Proposed by Curtis Hovey
Status: Merged
Merged at revision: 184
Proposed branch: lp://staging/~sinzui/juju-release-tools/build-centos
Merge into: lp://staging/juju-release-tools
Diff against target: 349 lines (+128/-47)
4 files modified
crossbuild.py (+59/-19)
tests/test_build_package.py (+4/-5)
tests/test_crossbuild.py (+60/-23)
utils.py (+5/-0)
To merge this branch: bzr merge lp://staging/~sinzui/juju-release-tools/build-centos
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+259982@code.staging.launchpad.net

Description of the change

Build centos7 agents and clients.

This branch adds a centos command to crossbuild.py to create both agent and client tar files.

    ./juju-release-tools/crossbuild.py -v centos -b ~/Work/crossbuild ./juju-core_1.24-beta5.tar.gz

Which made
    agent: juju-1.24-beta5-centos7-amd64.tgz
    client: juju-1.24-beta5-centos7.tar.gz

We only support centos7. It is built as linux amd64 using golang-1.2.1 as recommended by cloudbase. We know the juju built on trusty amd64 will sort of work on other linuxes. The errors are caused by unregistered series and packaging differences. 1.24 registered centos7 and packaging rules for it.

The code changes are small because centos agent rules are like windows, and client rules are like OS X. I renamed two functions to make them generic, and take the series and os_names
    make_win_agent_tarball() => make_agent_tarball(series)
    make_osx_tarball() => make_client_tarball(os_name)

The build_centos function call for the build, then calls for both tar files. The build is native, so the binaries are installed directly into the gopath/bin dir instead of a cross-complied subdir.

I took a moment to use the one-true way to express an octal. I also extracted autopatch so that I could re-use it.

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

Looks good, thanks!

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