Merge ~jslarraz/ubuntu-security-tools:ram-size-autopkgtest into ubuntu-security-tools:master

[Jorge Sancho Larraz]

umt/autopkgtest: add support for --ram-size option

Some autopkgtest requires more RAM than the default 512MB to complete successfully. That's the case of some tests in python-cryptography.

This MR enables the --ram-size configuration option from the `umt autopkgtest` CLI

[Marc Deslauriers (mdeslaur)]

looks good!

review: Approve

diff --git a/build-tools/umt b/build-tools/umt
index 408c522..3ff8767 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -3171,6 +3171,8 @@ def cmd_autopkgtest():
                         help="QEMU autopkgtest image name to use for tests (default: {images-path}/autopkgtest-{release}-{arch}.img)")
     parser.add_argument("-R", "--rebuild-image", dest="rebuild_image", default=False, action='store_true',
                         help="force the rebuild of the QEMU autopkgtest image")
+    parser.add_argument("--ram-size", dest="ram_size", default=None,
+                        help="RAM assigned to the vm that runs autopkgtest in MB (default: 512)")
     parser.add_argument("-s", "--skip-baseline",  dest="skip_baseline",  default=False, action='store_true',
                         help="Don't try and run the tests against the archive build as a baseline")
     parser.add_argument("-n", "--dry-run",  dest="dry_run",  default=False, action='store_true',
@@ -3265,6 +3267,8 @@ def run_autopkgtest_tests(opt, args, details):
                 qemu_arch = "arm"
             args.append("--qemu-architecture=" + qemu_arch)
             args.append("--timeout-reboot=300")
+        if opt.ram_size is not None:
+            args.append("--ram-size=" + opt.ram_size)
         if not opt.skip_baseline:
             if not opt.dry_run:
                 prepare_dir(os.path.join(autopkgtest_dest, prev_version), opt.force)