f20 - do not fail on missing metadata
not all boards will have all 4 files. Cleanly skip if missing.
BUG=None
TEST=./build_api
Change-Id: I1979d66b372b4b536cad0b539f4402d5672459ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3158561
Tested-by: Derek Beckett <dbeckett@chromium.org>
Tested-by: Sean McAllister <smcallis@google.com>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Sean McAllister <smcallis@google.com>
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
diff --git a/test/container/utils/container_prep.py b/test/container/utils/container_prep.py
old mode 100644
new mode 100755
index 05ca7f5..c504cb4
--- a/test/container/utils/container_prep.py
+++ b/test/container/utils/container_prep.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright 2021 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
@@ -20,145 +20,152 @@
def parse_local_arguments():
- """Parse the CLI."""
- parser = argparse.ArgumentParser(
- description="Prep Tauto, Tast, & Services for DockerBuild.")
- parser.add_argument('-chroot', dest='chroot',
- help='chroot (String): The chroot path to use.')
- parser.add_argument('-sysroot', dest='sysroot',
- help=' sysroot (String): The sysroot path to use.')
- parser.add_argument('-path', dest='path',
- help='path (String): Path to write artifacts to.')
- parser.add_argument('-force_path', dest='force_path', default=False,
- help='Delete anything conflicting in the outpath.')
- parser.add_argument('-src', dest='src',
- help='path (String): The src tree path.')
+ """Parse the CLI."""
+ parser = argparse.ArgumentParser(
+ description='Prep Tauto, Tast, & Services for DockerBuild.')
+ parser.add_argument('-chroot',
+ dest='chroot',
+ help='chroot (String): The chroot path to use.')
+ parser.add_argument('-sysroot',
+ dest='sysroot',
+ help=' sysroot (String): The sysroot path to use.')
+ parser.add_argument('-path',
+ dest='path',
+ help='path (String): Path to write artifacts to.')
+ parser.add_argument('-force_path',
+ dest='force_path',
+ default=False,
+ help='Delete anything conflicting in the outpath.')
+ parser.add_argument('-src',
+ dest='src',
+ help='path (String): The src tree path.')
- args = parser.parse_args()
- return args
+ args = parser.parse_args()
+ return args
class DockerPrep():
- """Prep Needed files for the Test Execution Container Docker Build."""
+ """Prep Needed files for the Test Execution Container Docker Build."""
- def __init__(self, args):
- """@param args (ArgumentParser): .chroot, .sysroot, .path."""
- self.args = args
- self.full_autotest = ""
- self.full_bin = ""
- self.full_out = ""
- self.build_path = ""
- self.chroot_bin = ""
- self.chroot = self.args.chroot
- self.src_root = self.args.src
- self.sysroot = self.args.sysroot
- if self.sysroot.startswith('/'):
- self.sysroot = self.sysroot[1:]
+ def __init__(self, args):
+ """@param args (ArgumentParser): .chroot, .sysroot, .path."""
+ self.args = args
+ self.full_autotest= ''
+ self.full_bin= ''
+ self.full_out= ''
+ self.build_path= ''
+ self.chroot_bin= ''
+ self.chroot = self.args.chroot
+ self.src_root = self.args.src
+ self.sysroot = self.args.sysroot
+ if self.sysroot.startswith('/'):
+ self.sysroot = self.sysroot[1:]
- def config_paths(self):
- """Build up the paths needed in local mem."""
- self.build_path = os.path.join(self.chroot, self.sysroot)
- self.full_autotest = os.path.join(
- self.build_path, 'usr/local/build/autotest')
- self.chroot_bin = os.path.join(self.chroot, 'usr/bin')
- self.full_bin = os.path.join(self.build_path, 'usr/bin')
- self.full_out = os.path.join(self.build_path, self.args.path)
- self.validate_paths()
- self.prep_artifact_dir()
+ def config_paths(self):
+ """Build up the paths needed in local mem."""
+ self.build_path = os.path.join(self.chroot, self.sysroot)
+ self.full_autotest = os.path.join(self.build_path,
+ 'usr/local/build/autotest')
+ self.chroot_bin = os.path.join(self.chroot, 'usr/bin')
+ self.full_bin = os.path.join(self.build_path, 'usr/bin')
+ self.full_out = os.path.join(self.build_path, self.args.path)
+ self.validate_paths()
+ self.prep_artifact_dir()
- def validate_paths(self):
- """Verify the paths generated are valid/exist."""
- if not os.path.isdir(self.full_autotest):
- if not os.path.exists(self.full_autotest):
- raise Exception("Autotest path %s does not exist"
- % self.full_autotest)
- raise Exception("Autotest path %s is not a directory"
- % self.full_autotest)
+ def validate_paths(self):
+ """Verify the paths generated are valid/exist."""
+ if not os.path.isdir(self.full_autotest):
+ if not os.path.exists(self.full_autotest):
+ raise Exception('Autotest path %s does not exist' %
+ self.full_autotest)
+ raise Exception('Autotest path %s is not a directory' %
+ self.full_autotest)
- if not os.path.isdir(self.build_path):
- if not os.path.exists(self.build_path):
- raise Exception("sysroot %s does not exist"
- % self.build_path)
- raise Exception("sysroot %s is not a directory" %
- self.build_path)
+ if not os.path.isdir(self.build_path):
+ if not os.path.exists(self.build_path):
+ raise Exception('sysroot %s does not exist' % self.build_path)
+ raise Exception('sysroot %s is not a directory' % self.build_path)
- def prep_artifact_dir(self):
- """Prepare the artifact dir. If it does not exist, create it."""
- if os.path.exists(self.full_out):
- if self.args.force_path:
- print("Deleting existing prepdir {}".format(self.full_out))
- shutil.rmtree(self.full_out)
- else:
- raise Exception("outpath %s exists and force is not set."
- % self.full_out)
- os.makedirs(self.full_out, exist_ok=True)
+ def prep_artifact_dir(self):
+ """Prepare the artifact dir. If it does not exist, create it."""
+ if os.path.exists(self.full_out):
+ if self.args.force_path:
+ print('Deleting existing prepdir {}'.format(self.full_out))
+ shutil.rmtree(self.full_out)
+ else:
+ raise Exception('outpath %s exists and force is not set.' %
+ self.full_out)
+ os.makedirs(self.full_out, exist_ok=True)
- def create_tarball(self):
- """Copy the Stuff."""
- builder = container_util.AutotestTarballBuilder(
- os.path.dirname(self.full_autotest),
- self.full_out,
- self.chroot)
+ def create_tarball(self):
+ """Copy the Stuff."""
+ builder = container_util.AutotestTarballBuilder(
+ os.path.dirname(self.full_autotest), self.full_out, self.chroot)
- builder.BuildFullAutotestandTastTarball()
+ builder.BuildFullAutotestandTastTarball()
- def copy_services(self):
- """Copy services needed for Docker."""
- shutil.copy(os.path.join(self.chroot_bin, 'testexecserver'),
- self.full_out)
+ def copy_services(self):
+ """Copy services needed for Docker."""
+ shutil.copy(os.path.join(self.chroot_bin, 'testexecserver'),
+ self.full_out)
- def copy_metadata(self):
- """Return the absolute path of the metadata files."""
- # Relative to build
- _BUILD_METADATA_FILES = [
- ('usr/local/build/autotest/autotest_metadata.pb',
- os.path.join(self.full_out, 'autotest_metadata.pb')),
- ('usr/share/tast/metadata/local/cros.pb',
- os.path.join(self.full_out, 'local_cros.pb')),
- ('build/share/tast/metadata/local/crosint.pb',
- os.path.join(self.full_out, 'crosint.pb'))]
+ def copy_metadata(self):
+ """Return the absolute path of the metadata files."""
+ # Relative to build
+ _BUILD_METADATA_FILES = [
+ ('usr/local/build/autotest/autotest_metadata.pb',
+ os.path.join(self.full_out, 'autotest_metadata.pb')),
+ ('usr/share/tast/metadata/local/cros.pb',
+ os.path.join(self.full_out, 'local_cros.pb')),
+ ('build/share/tast/metadata/local/crosint.pb',
+ os.path.join(self.full_out, 'crosint.pb'))
+ ]
- # relative to chroot.
- _CHROOT_METADATA_FILES = [
- ('usr/share/tast/metadata/remote/cros.pb',
- os.path.join(self.full_out, 'remote_cros.pb'))]
+ # relative to chroot.
+ _CHROOT_METADATA_FILES = [('usr/share/tast/metadata/remote/cros.pb',
+ os.path.join(self.full_out,
+ 'remote_cros.pb'))]
- for f, d in _BUILD_METADATA_FILES:
- shutil.copyfile(
- container_util.FromSysrootPath(self.build_path, f),
- os.path.join(self.full_out, d))
+ for f, d in _BUILD_METADATA_FILES:
+ full_md_path = container_util.FromSysrootPath(self.build_path, f)
+ if not os.path.exists(full_md_path):
+ print('Path %s does not exist, skipping' % full_md_path)
+ continue
+ shutil.copyfile(full_md_path, os.path.join(self.full_out, d))
- for f, d in _CHROOT_METADATA_FILES:
- shutil.copyfile(
- container_util.FromChrootPath(self.chroot, f),
- os.path.join(self.full_out, d))
+ for f, d in _CHROOT_METADATA_FILES:
+ full_md_path = container_util.FromSysrootPath(self.chroot, f)
+ if not os.path.exists(full_md_path):
+ print('Path %s does not exist, skipping' % full_md_path)
+ continue
+ shutil.copyfile(full_md_path, os.path.join(self.full_out, d))
- def copy_dockerfiles(self):
- """Copy Dockerfiles needed to build the container to the output dir."""
- dockerfile_relative_dir = 'platform/dev/test/container/dockerfiles/'
+ def copy_dockerfiles(self):
+ """Copy Dockerfiles needed to build the container to the output dir."""
+ dockerfile_relative_dir = 'platform/dev/test/container/dockerfiles/'
- src = os.path.join(self.src_root, dockerfile_relative_dir)
- for item in os.listdir(src):
- s = os.path.join(src, item)
- d = os.path.join(self.full_out, item)
- shutil.copy2(s, d)
+ src = os.path.join(self.src_root, dockerfile_relative_dir)
+ for item in os.listdir(src):
+ s = os.path.join(src, item)
+ d = os.path.join(self.full_out, item)
+ shutil.copy2(s, d)
def main():
- """Entry point."""
+ """Entry point."""
- if not (sys.version_info.major == 3 and sys.version_info.minor >= 6):
- print('python3.6 or greater is required.')
- sys.exit(1)
+ if not (sys.version_info.major == 3 and sys.version_info.minor >= 6):
+ print('python3.6 or greater is required.')
+ sys.exit(1)
- args = parse_local_arguments()
- builder = DockerPrep(args)
- builder.config_paths()
- builder.create_tarball()
- builder.copy_services()
- builder.copy_metadata()
- builder.copy_dockerfiles()
+ args = parse_local_arguments()
+ builder = DockerPrep(args)
+ builder.config_paths()
+ builder.create_tarball()
+ builder.copy_services()
+ builder.copy_metadata()
+ builder.copy_dockerfiles()
-if __name__ == "__main__":
- main()
+if __name__ == '__main__':
+ main()
