commit b4645a2630ae701c634770ce0814b2dbcadf3f69
author Matthew Clarkson <matthew.clarkson@arm.com> Wed Nov 06 13:34:39 2019 +0000
committer Matthew Clarkson <matthew.clarkson@arm.com> Wed Nov 06 13:34:39 2019 +0000
tree 93705cc78cc0c9c87b5f0ffaddba12c63a34fa7b
parent 5999648991e6c9e9a6296baf1756c81e4fdc19bd

infra: quality of life

  - Prevents Makefile argument being overridden which can mess with
    dependency detection
  - Allows containers to be built with `podman`
  - Removes unnecessary package in sandbox container
  - New `--build` flag to close cycle time on testing new sandbox
    image changes locally
  - CI config works under Python 3

Change-Id: Id0e6741e1c880403c407e5b68a8da948cb143e9a

tools/run_test_like_ci

diff --git a/tools/run_test_like_ci b/tools/run_test_like_ci
index 98b788e..4f35def 100755
--- a/tools/run_test_like_ci
+++ b/tools/run_test_like_ci
@@ -16,6 +16,7 @@
 from __future__ import print_function
 import argparse
 import distutils
+import errno
 import grp
 import os
 import readline
@@ -23,6 +24,7 @@
 import shutil
 import subprocess
 from pipes import quote
+from subprocess import check_call
 
 try:
   from shutil import which as find_executable
@@ -77,7 +79,9 @@
       choices=('podman', 'docker'),
       default='podman' if find_executable('podman') else 'docker')
   parser.add_argument(
-      '--image', default=SANDBOX_IMG, help='The image to use to run the tests')
+      '--build',
+      action='store_true',
+      help='Will perform a build of sandbox image')
   group = parser.add_mutually_exclusive_group()
   group.add_argument(
       '--confirm',
@@ -102,6 +106,14 @@
     print('Modified files:\n' + modified_files)
     decision('Do you know what you are doing', confirm=args.confirm)
 
+  if args.build:
+    print('')
+    print('About to build %r locally with %r' % (args.image, args.runner))
+    decision(confirm=args.confirm)
+    check_call(('make', '-C', os.path.join(REPO_ROOT, 'infra',
+                                           'ci'),
+                'BUILDER=%s' % args.runner, 'build-sandbox'))
+
   env = {
       'PERFETTO_TEST_GIT_REF': 'file:///ci/source',
   }
@@ -119,7 +131,7 @@
   ]
   for kv in env.items():
     cmd += ['--env', '%s=%s' % kv]
-  cmd += [args.image]
+  cmd += [SANDBOX_IMG]
   cmd += [
       'bash', '-c',
       'cd /ci/ramdisk; bash /ci/init.sh || sudo -u perfetto -EH bash -i'
@@ -136,7 +148,18 @@
   print('The contents of %s will be deleted before starting the VM' % workdir)
   decision(confirm=args.confirm)
 
-  shutil.rmtree(workdir, ignore_errors=True)
+  try:
+    shutil.rmtree(workdir)
+  except EnvironmentError as e:
+    if e.errno == errno.ENOENT:
+      pass
+    elif e.errno == errno.EACCES:
+      print('')
+      print('Removing previous volume %r' % workdir)
+      check_call(('sudo', 'rm', '-r', quote(workdir)))
+    else:
+      raise
+
   os.makedirs(workdir)
   os.execvp(cmd[0], cmd)