Fix build image steps for introspector (#7859)

This commit is contained in:
Navidem 2022-06-14 06:02:08 -05:00 committed by GitHub
parent dead89aa00
commit cb65a0bbcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions

View File

@ -62,16 +62,6 @@ def _get_introspector_base_images_steps(images, tag_prefix=TAG_PREFIX):
'https://github.com/google/oss-fuzz.git',
],
'name': 'gcr.io/cloud-builders/git',
}, {
'name': 'gcr.io/cloud-builders/docker',
'args': ['pull', 'gcr.io/oss-fuzz-base/base-clang:introspector'],
}, {
'name':
'gcr.io/cloud-builders/docker',
'args': [
'tag', 'gcr.io/oss-fuzz-base/base-clang:introspector',
'gcr.io/oss-fuzz-base/base-clang:latest'
],
}]
for base_image in images:
@ -80,6 +70,15 @@ def _get_introspector_base_images_steps(images, tag_prefix=TAG_PREFIX):
if base_image == 'base-clang':
args_list.extend(['--build-arg', 'introspector=1'])
elif base_image == 'base-builder':
steps.append({
'name':
'gcr.io/cloud-builders/docker',
'args': [
'tag', 'gcr.io/oss-fuzz-base/base-clang:introspector',
'gcr.io/oss-fuzz-base/base-clang:latest'
]
})
args_list.extend([
'-t',