diff --git a/memorystore/redis/gce_deployment/deploy.sh b/memorystore/redis/gce_deployment/deploy.sh old mode 100644 new mode 100755 index cf097afb8d..8159708a6b --- a/memorystore/redis/gce_deployment/deploy.sh +++ b/memorystore/redis/gce_deployment/deploy.sh @@ -27,13 +27,13 @@ GOOS=linux GOARCH=amd64 go build -v -o app ../main.go # Add the app binary tar -cvf app.tar app # Copy to GCS bucket -gsutil cp app.tar gs://"$GCS_BUCKET_NAME"/gce/ +gcloud storage cp app.tar gs://"$GCS_BUCKET_NAME"/gce/ # Create an instance gcloud compute instances create my-instance \ - --image-family=debian-9 \ + --image-family=debian-11 \ --image-project=debian-cloud \ - --machine-type=g1-small \ + --machine-type=e2-small \ --scopes cloud-platform \ --metadata-from-file startup-script=startup-script.sh \ --metadata gcs-bucket="$GCS_BUCKET_NAME",redis-host="$REDISHOST",redis-port="$REDISPORT" \ diff --git a/memorystore/redis/gce_deployment/startup-script.sh b/memorystore/redis/gce_deployment/startup-script.sh index e05c51d293..3f4b637b71 100644 --- a/memorystore/redis/gce_deployment/startup-script.sh +++ b/memorystore/redis/gce_deployment/startup-script.sh @@ -24,7 +24,7 @@ fi chmod +x google-fluentd-install.sh && ./google-fluentd-install.sh service google-fluentd restart & -gsutil cp gs://"$GCS_BUCKET_NAME"/gce/app.tar /app.tar +gcloud storage cp gs://"$GCS_BUCKET_NAME"/gce/app.tar /app.tar mkdir -p /app tar -x -f /app.tar -C /app chmod +x /app/app diff --git a/testing/cloudbuild/cloudbuild.yaml b/testing/cloudbuild/cloudbuild.yaml index e4f388f9d3..50845c6583 100644 --- a/testing/cloudbuild/cloudbuild.yaml +++ b/testing/cloudbuild/cloudbuild.yaml @@ -23,8 +23,9 @@ steps: - REPORT_REPO=golang-samples # Get the credentials for integration tests. -- name: gcr.io/cloud-builders/gsutil - args: ['cp', 'gs://golang-samples-secrets/golang-samples-tests-4fbf85dd0f24.json', 'key.json'] +- name: gcr.io/google.com/cloudsdktool/google-cloud-cli + entrypoint: gcloud + args: ['storage', 'cp', 'gs://golang-samples-secrets/golang-samples-tests-4fbf85dd0f24.json', 'key.json'] # Run the tests - name: gcr.io/$PROJECT_ID/go19 diff --git a/testing/gimmeproj/Makefile b/testing/gimmeproj/Makefile index b614fd70c8..79af721b6d 100644 --- a/testing/gimmeproj/Makefile +++ b/testing/gimmeproj/Makefile @@ -14,4 +14,4 @@ cross: GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o bin/windows_amd64/gimmeproj.exe upload: cross - gsutil -m cp -a public-read -r bin/* gs://gimme-proj/ + gcloud storage cp -r bin/* gs://gimme-proj/ --predefined-acl=public-read