Merge lp:~andrewjbeach/juju-release-tools/ubuntu-parse-args into lp:juju-release-tools

[Andrew James Beach]

Adds code to actually use crossbuild.build_ubuntu_agent. This is a new
sub-parser for the command line and another elif block if the sub-parser is
used.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[lp:~andrewjbeach/juju-release-tools/ubuntu-parse-args]

357. By Andrew James Beach on 2016-11-28

Merged build-ubuntu-agent into ubuntu-parse-args.

=== modified file 'crossbuild.py'
--- crossbuild.py	2016-11-28 23:02:09 +0000
+++ crossbuild.py	2016-11-28 23:02:09 +0000
@@ -292,7 +292,7 @@
     parser_win_agent = subparsers.add_parser(
         'win-agent', help='Build an amd64 windows juju agent.')
     parser_win_agent.add_argument(
-        '-b', '--build-dir', default='~/crossbuild',
+        '-b', '--build-dir', default='$HOME/crossbuild',
         help='The path cross build dir.')
     parser_win_agent.add_argument(
         'tarball_path', help='The path to the juju source tarball.')
@@ -312,6 +312,17 @@
         help='The path cross build dir.')
     parser_centos.add_argument(
         'tarball_path', help='The path to the juju source tarball.')
+    # ./crossbuild ubuntu juju-core-1.2.3.tar.gz
+    parser_ubuntu = subparsers.add_parser(
+        'ubuntu', help='Build an Ubuntu <something> agent.')
+    parser_ubuntu.add_argument(
+        '--goarch', default='amd64',
+        help='The GOARCH to build. Environment: $GOARCH.')
+    parser_ubuntu.add_argument(
+        '-b', '--build-dir', default='$HOME/crossbuild',
+        help='The path cross build dir.')
+    parser_ubuntu.add_argument(
+        'tarball_path', help='The path to the juju source tarball.')
     return parser.parse_args(args)
 
 
@@ -339,6 +350,10 @@
             build_centos(
                 args.tarball_path, args.build_dir,
                 dry_run=args.dry_run, verbose=args.verbose)
+        elif args.command == 'ubuntu':
+            build_ubuntu_agent(
+                args.tarball_path, args.build_dir, args.goarch,
+                dry_run=args.dry_run, verbose=args.verbose)
     except Exception as e:
         print(e)
         print(getattr(e, 'output', ''))
 
=== modified file 'tests/test_crossbuild.py'
--- tests/test_crossbuild.py	2016-11-28 23:02:09 +0000
+++ tests/test_crossbuild.py	2016-11-28 23:02:09 +0000
@@ -20,6 +20,7 @@
     make_client_tarball,
     make_agent_tarball,
     main,
+    parse_args,
     run_command,
     working_directory,
 )
@@ -340,3 +341,12 @@
              '1.2.3',
              os.getcwd()),
             mt_mock.call_args[0])
+
+
+class TestParseArgs(TestCase):
+
+    def test_parse_args_ubuntu_goarch(self):
+        args = parse_args(['ubuntu', '/ball/path'])
+        self.assertEqual('amd64', args.goarch)
+        args = parse_args(['ubuntu', '/ball/path', '--goarch', 'arm64'])
+        self.assertEqual('arm64', args.goarch)