← Back to branch summary

~andrewjbeach/juju-release-tools/ubuntu-parse-args

« back to all changes in this revision

Viewing changes to crossbuild.py

  • Committer: Andrew Beach
  • Date: 2016-11-28 23:01:01 UTC
  • mfrom: (353.1.3 build-ubuntu-agent)
  • Revision ID: andrew.beach@canonical.com-20161128230101-wk0c3bx54hbq5bxs
Merged build-ubuntu-agent into ubuntu-parse-args.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crossbuild.py
245
245
            dry_run=dry_run, verbose=verbose)
246
246
 
247
247
 
248
 
def build_ubuntu_agent(tarball_path, build_dir, architecture,
 
248
def build_ubuntu_agent(tarball_path, build_dir, goarch,
249
249
                       dry_run=False, verbose=False):
250
250
    """Build an ubuntu juju agent from a tarball."""
251
251
    cwd = os.getcwd()
254
254
    with go_tarball(tarball_path) as (gopath, version):
255
255
        # This command always executes in a tmp dir, it does not make changes.
256
256
        go_build(
257
 
            agent_package, goroot, gopath, architecture, 'linux',
 
257
            agent_package, goroot, gopath, goarch, 'linux',
258
258
            dry_run=False, verbose=verbose)
259
259
        built_agent_path = os.path.join(gopath, 'bin', 'jujud')
260
260
        make_agent_tarball(