diff --git a/infra/build/functions/project_experiment.py b/infra/build/functions/project_experiment.py index 660a971f7c8c..cf4f71d67613 100644 --- a/infra/build/functions/project_experiment.py +++ b/infra/build/functions/project_experiment.py @@ -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/*', diff --git a/infra/build/functions/target_experiment.py b/infra/build/functions/target_experiment.py index 19c4f4757b09..c65ce38c2877 100644 --- a/infra/build/functions/target_experiment.py +++ b/infra/build/functions/target_experiment.py @@ -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}'), ], }) @@ -136,7 +136,7 @@ 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': [ @@ -144,7 +144,7 @@ def run_experiment(project_name, (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'), ], }) @@ -152,12 +152,12 @@ def run_experiment(project_name, # 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'), ], }) @@ -165,7 +165,7 @@ def run_experiment(project_name, # Upload stacktrace. steps.append({ 'name': - 'gcr.io/cloud-builders/gsutil', + 'gcr.io/cloud-builders/gcloud', 'entrypoint': '/bin/bash', 'args': [ @@ -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'), ], }) @@ -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'), @@ -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'), @@ -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'), diff --git a/infra/build/status/deploy.sh b/infra/build/status/deploy.sh index 060eba9480c2..37d36f1b82db 100755 --- a/infra/build/status/deploy.sh +++ b/infra/build/status/deploy.sh @@ -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