Skip to content

chore: Migrate gsutil usage to gcloud storage #148

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: main
Choose a base branch
from
Open

chore: Migrate gsutil usage to gcloud storage #148

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
16 changes: 8 additions & 8 deletions config/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function setup {
if [ ! -f "${EVIDENCE_DISK}" ]; then
evidence_disk_url=$(normalize_gcs_url "${EVIDENCE_DISK_GSURL}")
msg "Downloading evidence disk from ${evidence_disk_url}"
gsutil -q cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
gcloud storage cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
fi

}
Expand Down Expand Up @@ -174,7 +174,7 @@ function normalize_gcs_url {
function check_stamp {
local stamp_url
stamp_url=$(normalize_gcs_url "${GCS_EXPECTED_URL}/stamp.json")
gsutil -q cp "${stamp_url}" stamp.json
gcloud storage cp "${stamp_url}" stamp.json
# Check that the stamp is a valid JSON file
python3 config/jenkins/e2e_tools.py check_stamp stamp.json
}
Expand All @@ -183,7 +183,7 @@ function check_stamp {
function check_system_info {
local system_info_url
system_info_url=$(normalize_gcs_url "${GCS_EXPECTED_URL}/system_info.txt")
gsutil -q cp "${system_info_url}" system_info.txt
gcloud storage cp "${system_info_url}" system_info.txt
python3 config/jenkins/e2e_tools.py check_system_info system_info.txt
}

Expand All @@ -193,7 +193,7 @@ function check_system_info {
function check_firmware {
local firmware_url
firmware_url=$(normalize_gcs_url "${GCS_EXPECTED_URL}/Firmware/rom.bin")
gsutil -q stat "${firmware_url}"
gcloud storage objects list --stat --fetch-encrypted-object-hashes "${firmware_url}"
}

# Checks the files related to the evidence disk.
Expand All @@ -207,22 +207,22 @@ function check_disk {
lsblk_url=$(normalize_gcs_url "${GCS_EXPECTED_URL}/Disks/lsblk.txt")
udevadm_url=$(normalize_gcs_url "${GCS_EXPECTED_URL}/Disks/sdb.udevadm.txt")
msg "Checking MD5 of ${disk_url}"
if gsutil -q hash -m -h "${disk_url}"| grep -q "${EVIDENCE_DISK_MD5_HEX}"; then
if gcloud storage hash --skip-crc32c --hex "${disk_url}"| grep -q "${EVIDENCE_DISK_MD5_HEX}"; then
msg "MD5 is correct for ${disk_url}"
else
die "Bad MD5 for ${disk_url}"
fi

msg "Checking ${lsblk_url}"
gsutil cp "${lsblk_url}" "lsblk.txt"
gcloud storage cp "${lsblk_url}" "lsblk.txt"
python3 config/jenkins/e2e_tools.py check_lsblk lsblk.txt

msg "Checking ${hash_url}"
gsutil cp "${hash_url}" "sdb.hash"
gcloud storage cp "${hash_url}" "sdb.hash"
python3 config/jenkins/e2e_tools.py check_hash "sdb.hash"

msg "Checking ${udevadm_url}"
gsutil cp "${udevadm_url}" sdb.udevadm.txt
gcloud storage cp "${udevadm_url}" sdb.udevadm.txt
python3 config/jenkins/e2e_tools.py check_udevadm sdb.udevadm.txt
}

Expand Down
10 changes: 5 additions & 5 deletions tools/remaster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,10 +552,10 @@ function make_custom_ubuntu_iso {
# The bucket name, as string
function create_bucket {
local bucket=$1
if gsutil -q ls -p "${FLAGS_CLOUD_PROJECT_NAME}" "gs://" | grep -q "gs://${bucket}/"; then
if gcloud storage ls --project "${FLAGS_CLOUD_PROJECT_NAME}" | grep -q "gs://${bucket}/"; then
msg "Bucket ${bucket} already exists in project ${FLAGS_CLOUD_PROJECT_NAME}"
else
gsutil mb -p "${FLAGS_CLOUD_PROJECT_NAME}" "gs://${bucket}/"
gcloud storage buckets create --project "${FLAGS_CLOUD_PROJECT_NAME}" "gs://${bucket}/"
fi
}

Expand All @@ -578,7 +578,7 @@ function create_service_account {
--member "serviceAccount:${gcs_sa_email}" --role "roles/logging.logWriter"
fi
# Give the SA create permissions
gsutil iam ch "serviceAccount:${gcs_sa_email}:objectCreator" "gs://${gcs_bucket_name}"
gcloud storage buckets add-iam-policy-binding "gs://${gcs_bucket_name}" --member "serviceAccount:${gcs_sa_email}" --role "roles/storage.objectCreator"
}

# Creates and downloads a service account private key
Expand All @@ -603,8 +603,8 @@ function create_sa_key {

# Makes sure Gcloud stuff is present and user is logged in.
function check_gcs {
if [[ "$(which gsutil)" == "" ]]; then
die "Please install gsutil ( see https://cloud.google.com/storage/docs/gsutil_install ) "
if [[ "$(which gcloud)" == "" ]]; then
die "Please install gcloud ( see https://cloud.google.com/sdk/docs/install ) "
fi
gcloud_accounts=$(gcloud auth list --filter=status:ACTIVE --format="value(account)")
if [[ "${gcloud_accounts}" == "" ]]; then
Expand Down