Skip to content

chore: Migrate gsutil usage to gcloud storage #3755

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gurusai-voleti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: Migrate gsutil usage to gcloud storage #3755

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
2 changes: 1 addition & 1 deletion kokoro/ubuntu/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -o errexit


gsutil -q cp "gs://ct4e-m2-repositories-for-kokoro/m2-cache.tar" - \
gcloud storage cp "gs://ct4e-m2-repositories-for-kokoro/m2-cache.tar" - \
| tar -C "${HOME}" -xf -

export CLOUDSDK_CORE_DISABLE_USAGE_REPORTING=true
Expand Down
2 changes: 1 addition & 1 deletion kokoro/windows/continuous.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ java -version

rem To speed up build, download and unpack an M2 repo cache.
pushd %USERPROFILE%
call gsutil.cmd -q cp "gs://ct4e-m2-repositories-for-kokoro/m2-cache.tar" .
call gcloud.cmd storage cp "gs://ct4e-m2-repositories-for-kokoro/m2-cache.tar" .
@echo on
tar xf m2-cache.tar && del m2-cache.tar
popd
Expand Down
8 changes: 4 additions & 4 deletions release/copy_repo_to_final_location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ def _IsVersionString(string):
def _GcsLocationExists(gcs_location):
try:
subprocess.check_output(
["gsutil", "ls", gcs_location], stderr=subprocess.STDOUT)
["gcloud", "storage", "ls", gcs_location], stderr=subprocess.STDOUT)
return True
except subprocess.CalledProcessError:
return False


def _GetCopyCommand(origin, destination):
return ["gsutil", "-m", "cp", "-R", origin, destination]
return ["gcloud", "storage", "cp", "--recursive", origin, destination]


def _GetPublicAccessCommand(target):
return ["gsutil", "-m", "acl", "ch", "-R", "-u", "AllUsers:R", target]
return ["gcloud", "storage", "objects", "update", "--recursive", "--add-acl-grant=allUsers=READER", target]


def main(argv):
Expand All @@ -89,7 +89,7 @@ def main(argv):
print("# entered is correct, delete it first and try again.")
print("#")
print("# Command to delete:")
print("# gsutil -m rm " + gcs_destination + "/**")
print("# gcloud storage rm " + gcs_destination + "/**")
exit(1)

# Copy the repo
Expand Down
4 changes: 2 additions & 2 deletions release/copy_repo_to_final_location_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ def testGcsLocationExists_NonExistingLocation(self):
_GcsLocationExists("gs://cloud-tools-for-eclipse/non-existing"))

def testGetCopyCommand(self):
self.assertEquals(["gsutil", "-m", "cp", "-R", "origin", "destination"],
self.assertEquals(["gcloud", "storage", "cp", "--recursive", "origin", "destination"],
_GetCopyCommand("origin", "destination"))

def testGetPublicAccessCommand(self):
self.assertEquals(
["gsutil", "-m", "acl", "ch", "-R", "-u", "AllUsers:R", "target"],
["gcloud", "storage", "objects", "update", "--recursive", "--add-acl-grant=allUsers=R", "target"],
_GetPublicAccessCommand("target"))


Expand Down
Loading