diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 46d36006..b74fb58d 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -5,8 +5,8 @@ steps: secretEnv: - AUTOPUSH_DC_API_KEY - - name: 'gcr.io/cloud-builders/gsutil' - args: ['cp', 'tool/target/datacommons-import-tool-0.1-SNAPSHOT-jar-with-dependencies.jar', 'gs://datacommons_public/import_tools/import-tool.jar'] + - name: 'gcr.io/cloud-builders/gcloud' + args: ['storage', 'cp', 'tool/target/datacommons-import-tool-0.1-SNAPSHOT-jar-with-dependencies.jar', 'gs://datacommons_public/import_tools/import-tool.jar'] - name: 'gcr.io/cloud-builders/gcloud' args: ['builds', 'triggers', 'run', 'dc-import-executor', '--branch=master', '--substitutions', '_DOCKER_IMAGE=us-docker.pkg.dev/datcom-ci/gcr.io/dc-import-executor'] @@ -15,4 +15,3 @@ availableSecrets: secretManager: - versionName: projects/datcom-ci/secrets/autopush-dc-api-key/versions/latest env: AUTOPUSH_DC_API_KEY - diff --git a/simple/run_stats.sh b/simple/run_stats.sh index d48d0b94..f2f732d2 100755 --- a/simple/run_stats.sh +++ b/simple/run_stats.sh @@ -245,10 +245,10 @@ function copy_to_gcs { [[ -z "$gcs_dir" ]] && return - cmd="gsutil -m cp -r $dir $gcs_dir" + cmd="gcloud storage cp --recursive $dir $gcs_dir" run_cmd $cmd echo_log "Copied output files to $gcs_dir" - run_cmd gsutil ls -l -r "$gcs_dir" + run_cmd gcloud storage ls --long --recursive "$gcs_dir" } # Return if being sourced