diff options
| -rw-r--r-- | infra/gcb/build_and_run_coverage.py | 6 | ||||
| -rwxr-xr-x | infra/gcb/build_project.py | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/infra/gcb/build_and_run_coverage.py b/infra/gcb/build_and_run_coverage.py index babf85f6..1295b547 100644 --- a/infra/gcb/build_and_run_coverage.py +++ b/infra/gcb/build_and_run_coverage.py @@ -255,7 +255,7 @@ def get_build_steps(project_dir): ], } ) - return build_steps, image + return build_steps def get_targets_list(project_name): @@ -280,8 +280,8 @@ def main(): usage() project_dir = sys.argv[1].rstrip(os.path.sep) - steps, image = get_build_steps(project_dir) - build_project.run_build(steps, image, COVERAGE_BUILD_TAG) + steps = get_build_steps(project_dir) + build_project.run_build(steps, COVERAGE_BUILD_TAG) if __name__ == "__main__": diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py index a71f9251..8d91f085 100755 --- a/infra/gcb/build_project.py +++ b/infra/gcb/build_project.py @@ -326,7 +326,7 @@ def get_build_steps(project_dir): }, ]) - return build_steps, image + return build_steps def get_logs_url(build_id): @@ -345,7 +345,7 @@ def get_targets_list_url(bucket, project, sanitizer): return url -def run_build(build_steps, image, tag): +def run_build(build_steps, tag): options = {} if 'GCB_OPTIONS' in os.environ: options = yaml.safe_load(os.environ['GCB_OPTIONS']) @@ -355,7 +355,6 @@ def run_build(build_steps, image, tag): 'timeout': str(BUILD_TIMEOUT) + 's', 'options': options, 'logsBucket': GCB_LOGS_BUCKET, - 'images': [ image ], 'tags': [ tag ], } @@ -374,8 +373,8 @@ def main(): usage() project_dir = sys.argv[1].rstrip(os.path.sep) - steps, image = get_build_steps(project_dir) - run_build(steps, image, FUZZING_BUILD_TAG) + steps = get_build_steps(project_dir) + run_build(steps, FUZZING_BUILD_TAG) if __name__ == '__main__': |