From 17e2f96e6a47fff34092da4041da5d57f35be8cb Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Thu, 19 Aug 2021 20:05:32 -0700
Subject: [PATCH] [infra] Add a script for building all base-images with
 "-testing" (#6248)

suffix and pushing them to gcr.io/oss-fuzz-base.

This is useful for testing changes to images.
I used it to test changes I made for #6180.
This does not support msan as that image is being removed.

Also lint.
---
 .../base-builder-new/bisect_clang_new_test.py |  4 +-
 .../base-builder-new/detect_repo_new_test.py  |  4 +-
 infra/build_and_push_test_images.py           | 84 +++++++++++++++++++
 3 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 infra/build_and_push_test_images.py

diff --git a/infra/base-images/base-builder-new/bisect_clang_new_test.py b/infra/base-images/base-builder-new/bisect_clang_new_test.py
index 31c0699cd..1b7978faa 100644
--- a/infra/base-images/base-builder-new/bisect_clang_new_test.py
+++ b/infra/base-images/base-builder-new/bisect_clang_new_test.py
@@ -14,8 +14,8 @@
 #
 ################################################################################
 """Tests for bisect_clang.py"""
-# TODO(asraa): When base-builder-new is renamed to base-builder, rename this test
-# back to bisect_clang_test.py
+# TODO(asraa): When base-builder-new is renamed to base-builder, rename this
+# test back to bisect_clang_test.py
 import os
 from unittest import mock
 import unittest
diff --git a/infra/base-images/base-builder-new/detect_repo_new_test.py b/infra/base-images/base-builder-new/detect_repo_new_test.py
index d52a9773d..bad3e286a 100644
--- a/infra/base-images/base-builder-new/detect_repo_new_test.py
+++ b/infra/base-images/base-builder-new/detect_repo_new_test.py
@@ -18,8 +18,8 @@ This will consist of the following functional test:
   2. Determine if an OSS-Fuzz project main repo can be detected from a
   repo name.
 """
-# TODO(asraa): When base-builder-new is renamed to base-builder, rename this test
-# back to detect_repo_test.py
+# TODO(asraa): When base-builder-new is renamed to base-builder, rename this
+# test back to detect_repo_test.py
 import os
 import re
 import sys
diff --git a/infra/build_and_push_test_images.py b/infra/build_and_push_test_images.py
new file mode 100644
index 000000000..89fd6b65c
--- /dev/null
+++ b/infra/build_and_push_test_images.py
@@ -0,0 +1,84 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+"""Script for building and pushing base-images to gcr.io/oss-fuzz-base/ with
+"-test" suffix. This is useful for reusing the build infra to test image
+changes."""
+import logging
+import multiprocessing
+import os
+import subprocess
+
+TAG_PREFIX = 'gcr.io/oss-fuzz-base/'
+TESTING_TAG_SUFFIX = '-testing'
+INFRA_DIR = os.path.dirname(__file__)
+IMAGES_DIR = os.path.join(INFRA_DIR, 'base-images')
+
+
+def push_image(tag):
+  """Pushes image with |tag| to docker registry."""
+  logging.info('Pushing: %s', tag)
+  command = ['docker', 'push', tag]
+  subprocess.run(command, check=True)
+  logging.info('Pushed: %s', tag)
+
+
+def build_and_push_image(image):
+  """Builds and pushes |image| to docker registry with "-testing" suffix."""
+  main_tag = TAG_PREFIX + image
+  testing_tag = main_tag + TESTING_TAG_SUFFIX
+  tags = [main_tag, testing_tag]
+  build_image(image, tags)
+  push_image(testing_tag)
+
+
+def build_image(image, tags):
+  """Builds |image| and tags it with |tags|."""
+  logging.info('Building: %s', image)
+  command = ['docker', 'build']
+  for tag in tags:
+    command.extend(['--tag', tag])
+    path = os.path.join(IMAGES_DIR, image)
+  command.append(path)
+  subprocess.run(command, check=True)
+  logging.info('Built: %s', image)
+
+
+def build_and_push_images():
+  """Builds and pushes base-images."""
+  images = [
+      ['base-image'],
+      ['base-clang', 'base-runner'],
+      ['base-builder', 'base-runner-debug', 'base-builder-new'],
+      ['base-runner-debug', 'base-sanitizer-build-libs', 'base-builder-swift'],
+  ]
+  max_parallelization = max([len(image_list) for image_list in images])
+  proc_count = min(multiprocessing.cpu_count(), max_parallelization)
+  pool = multiprocessing.Pool(proc_count)
+  for image_list in images:
+    pool.map(build_and_push_image, image_list)
+
+
+def main():
+  """"Builds base-images tags them with "-testing" suffix (in addition to normal
+  tag) and pushes "-testing" suffixed images to docker registry."""
+  logging.basicConfig(level=logging.DEBUG)
+  logging.info('Doing simple gcloud command to ensure 2FA passes.')
+  subprocess.run(['gcloud', 'projects', 'list', '--limit=1'], check=True)
+  build_and_push_images()
+
+
+if __name__ == '__main__':
+  main()