Skip to content

[pull] master from google:master #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 5, 2026
Merged

[pull] master from google:master #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions infra/build/functions/project_experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ def run_experiment(project_name, command, output_path, experiment_name):
]
},
{
'name': 'gcr.io/cloud-builders/gsutil',
'name': 'gcr.io/cloud-builders/gcloud',
'args': [
'-m',
'storage',
'cp',
'-r',
'/workspace/out/*',
Expand Down
32 changes: 16 additions & 16 deletions infra/build/functions/target_experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,21 @@ def run_experiment(project_name,
}
steps.append(build_lib.dockerify_run_step(run_step, build))
steps.append({
'name': 'gcr.io/cloud-builders/gsutil',
'args': ['-m', 'cp', local_output_path, output_path]
'name': 'gcr.io/cloud-builders/gcloud',
'args': ['storage', 'cp', local_output_path, output_path]
})

# Upload corpus.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'entrypoint':
'/bin/bash',
'args': [
'-c',
(f'cd {local_corpus_path} && '
f'zip -r {local_corpus_zip_path} * && '
f'gsutil -m cp {local_corpus_zip_path} {upload_corpus_path} || '
f'gcloud storage cp {local_corpus_zip_path} {upload_corpus_path} || '
f'rm -f {local_corpus_zip_path}'),
],
})
Expand All @@ -136,36 +136,36 @@ def run_experiment(project_name,
# If multiple files are found, suffix them and upload them all.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'entrypoint':
'/bin/bash',
'args': [
'-c',
(f'cp {default_target_path} {local_target_dir} 2>/dev/null || '
f'find {build.out} -type f -name {target_name} -exec bash -c '
f'\'cp "$0" "{local_target_dir}/$(echo "$0" | sed "s@/@_@g")"\' '
f'{{}} \\; && gsutil cp -r {local_target_dir} '
f'{{}} \\; && gcloud storage cp -r {local_target_dir} '
f'{upload_reproducer_path}/target_binary || true'),
],
})

# Upload reproducer.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'entrypoint':
'/bin/bash',
'args': [
'-c',
(f'gsutil -m cp -r {local_artifact_path} {upload_reproducer_path} '
(f'gcloud storage cp -r {local_artifact_path} {upload_reproducer_path} '
'|| true'),
],
})

# Upload stacktrace.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'entrypoint':
'/bin/bash',
'args': [
Expand All @@ -178,7 +178,7 @@ def run_experiment(project_name,
f'"$target" {local_artifact_path}/* > '
f'"{local_stacktrace_path}/$target.st" 2>&1; '
'done; fi; '
f'gsutil -m cp -r {local_stacktrace_path} {upload_reproducer_path}'
f'gcloud storage cp -r {local_stacktrace_path} {upload_reproducer_path}'
' || true'),
],
})
Expand Down Expand Up @@ -230,9 +230,9 @@ def run_experiment(project_name,
# Upload raw coverage data.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'args': [
'-m',
'storage',
'cp',
'-r',
os.path.join(build.out, 'dumps'),
Expand All @@ -243,9 +243,9 @@ def run_experiment(project_name,
# Upload coverage report.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'args': [
'-m',
'storage',
'cp',
'-r',
os.path.join(build.out, 'report'),
Expand All @@ -256,9 +256,9 @@ def run_experiment(project_name,
# Upload textcovs.
steps.append({
'name':
'gcr.io/cloud-builders/gsutil',
'gcr.io/cloud-builders/gcloud',
'args': [
'-m',
'storage',
'cp',
'-r',
os.path.join(build.out, 'textcov_reports'),
Expand Down
2 changes: 1 addition & 1 deletion infra/build/status/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
################################################################################

gsutil -h "Cache-Control:no-cache,max-age=0" -m cp -r bower_components index.html src manifest.json gs://oss-fuzz-build-logs
gcloud storage cp --recursive --cache-control="no-cache,max-age=0" bower_components index.html src manifest.json gs://oss-fuzz-build-logs
Loading