From c3495be8f4bf603fd44498c963f1003904a4b117 Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:47:44 -0700 Subject: [PATCH] Support concurrent trial builds. (#8113) Do this by appending the branch to the test image suffix. --- infra/build/functions/trial_build.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/infra/build/functions/trial_build.py b/infra/build/functions/trial_build.py index 03054ece5..5bf89762d 100644 --- a/infra/build/functions/trial_build.py +++ b/infra/build/functions/trial_build.py @@ -292,11 +292,16 @@ def trial_build_main(args=None, local_base_build=True): """Main function for trial_build. Pushes test images and then does test builds.""" args = get_args(args) + if args.branch: + test_image_suffix = f'{TEST_IMAGE_SUFFIX}-{args.branch.lower()}' + else: + test_image_suffix = TEST_IMAGE_SUFFIX + if local_base_build: build_and_push_test_images.build_and_push_images( # pylint: disable=unexpected-keyword-arg - TEST_IMAGE_SUFFIX) + test_image_suffix) else: - build_and_push_test_images.gcb_build_and_push_images(TEST_IMAGE_SUFFIX) + build_and_push_test_images.gcb_build_and_push_images(test_image_suffix) return _do_test_builds(args)