Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[infra] Use 'coverage' and 'fuzzing' tags to filter builds (follow-up #1547). (#1751) 

* [infra] Use 'coverage' and 'fuzzing' tags to filter builds (follow-up #1547).

* Remove unintentional print call.

* Remove a variable that is not used anympre.
This commit is contained in:
Max Moroz 2018-08-23 19:14:09 -07:00 committed by GitHub
parent 04964f722a
commit 23a04ab280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/gcb/build_and_run_coverage.py
View File

@ -22,6 +22,8 @@ CORPUS_BACKUP_URL = ('/{0}-backup.clusterfuzz-external.appspot.com/corpus/'
# Cloud Builder has a limit of 100 build steps and 100 arguments for each step.
CORPUS_DOWNLOAD_BATCH_SIZE = 100
COVERAGE_BUILD_TAG = 'coverage'
# Needed for reading public target.list.* files.
GCS_URL_BASENAME = 'https://storage.googleapis.com/'
@ -189,7 +191,7 @@ def main():
project_dir = sys.argv[1].rstrip(os.path.sep)
steps, image = get_build_steps(project_dir)
build_project.run_build(steps, image)
build_project.run_build(steps, image, COVERAGE_BUILD_TAG)
if __name__ == "__main__":

11
infra/gcb/build_project.py
View File

@ -21,6 +21,10 @@ from googleapiclient.discovery import build
BUILD_TIMEOUT = 10 * 60 * 60
FUZZING_BUILD_TAG = 'fuzzing'
GCB_LOGS_BUCKET = 'oss-fuzz-gcb-logs'
CONFIGURATIONS = {
'sanitizer-address': ['SANITIZER=address'],
'sanitizer-memory': ['SANITIZER=memory'],
@ -331,7 +335,7 @@ def get_targets_list_url(bucket, project, sanitizer):
return url
def run_build(build_steps, image):
def run_build(build_steps, image, tag):
options = {}
if 'GCB_OPTIONS' in os.environ:
options = yaml.safe_load(os.environ['GCB_OPTIONS'])
@ -340,8 +344,9 @@ def run_build(build_steps, image):
'steps': build_steps,
'timeout': str(BUILD_TIMEOUT) + 's',
'options': options,
'logsBucket': 'oss-fuzz-gcb-logs',
'logsBucket': GCB_LOGS_BUCKET,
'images': [ image ],
'tags': [ tag ],
}
credentials = GoogleCredentials.get_application_default()
@ -360,7 +365,7 @@ def main():
project_dir = sys.argv[1].rstrip(os.path.sep)
steps, image = get_build_steps(project_dir)
run_build(steps, image)
run_build(steps, image, FUZZING_BUILD_TAG)
if __name__ == '__main__':

9
infra/gcb/builds_status.py
View File

@ -16,8 +16,9 @@ from google.cloud import logging
from google.cloud import storage
from jinja2 import Environment, FileSystemLoader
import build_project
STATUS_BUCKET = 'oss-fuzz-build-logs'
LOGS_BUCKET = 'oss-fuzz-gcb-logs'
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
RETRY_COUNT = 3
RETRY_WAIT = 5
@ -79,7 +80,7 @@ def find_last_build(builds):
storage_client = storage.Client()
status_bucket = storage_client.get_bucket(STATUS_BUCKET)
gcb_bucket = storage_client.get_bucket(LOGS_BUCKET)
gcb_bucket = storage_client.get_bucket(build_project.GCB_LOGS_BUCKET)
log_name = 'log-{0}.txt'.format(build['id'])
log = gcb_bucket.blob(log_name)
dest_log = status_bucket.blob(log_name)
@ -119,7 +120,8 @@ def main():
failures = []
for project in scan_project_names(projects_dir):
print project
query_filter = ('images="gcr.io/oss-fuzz/{0}"'.format(project))
query_filter = ('images="gcr.io/oss-fuzz/{0}" AND tags="{1}"'.format(
project, build_project.FUZZING_BUILD_TAG))
try:
response = execute_with_retries(cloudbuild.projects().builds().list(
projectId='oss-fuzz', pageSize=2, filter=query_filter))
@ -131,6 +133,7 @@ def main():
continue
builds = response['builds']
last_build = find_last_build(builds)
if not last_build:
print >> sys.stderr, 'Failed to get build for', project