Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions ci/cloudbuild/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ steps:
echo "_SKIP_DOWNLOAD_KF_CLI is set to true. Not downloading CLI..."
else
echo "Downloading Kf CLI..."
gsutil cp ${_FULL_RELEASE_BUCKET}/kf-linux /workspace/${BUILD_ID}/kf
gcloud storage cp ${_FULL_RELEASE_BUCKET}/kf-linux /workspace/${BUILD_ID}/kf
chmod +x /workspace/${BUILD_ID}/kf
fi

gsutil cp ${_FULL_RELEASE_BUCKET}/cloud-build/fresh-cluster.yaml /workspace/${BUILD_ID}/fresh-cluster.yaml
gsutil cp ${_FULL_RELEASE_BUCKET}/cloud-build/delete-cluster.yaml /workspace/${BUILD_ID}/delete-cluster.yaml
gcloud storage cp ${_FULL_RELEASE_BUCKET}/cloud-build/fresh-cluster.yaml /workspace/${BUILD_ID}/fresh-cluster.yaml
gcloud storage cp ${_FULL_RELEASE_BUCKET}/cloud-build/delete-cluster.yaml /workspace/${BUILD_ID}/delete-cluster.yaml

- id: unit tests
waitFor: ['-']
Expand Down Expand Up @@ -284,7 +284,7 @@ steps:
--substitutions="$$VARS"

if [ ! -z "${_EXTRA_CERTS_URL}" ]; then
gsutil cp "${_EXTRA_CERTS_URL}" /workspace/certs.pem
gcloud storage cp "${_EXTRA_CERTS_URL}" /workspace/certs.pem
fi

- id: deploy certs
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate-release/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ steps:
- |
FOLDER="$(</workspace/substitutions/release_folder)"
BUCKET="$(</workspace/substitutions/release_bucket)"
gsutil -m cp -r * gs://$${BUCKET}/$${FOLDER}/
gcloud storage cp --recursive * gs://$${BUCKET}/$${FOLDER}/

- id: build deployer image
waitFor:
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate-release/scripts/setup-kcc.bash
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ trap 'rm -fr $tempdir' EXIT

cd ${tempdir}
kcc_url=$(kf dependencies url 'Config Connector')
gsutil cp ${kcc_url} release-bundle.tar.gz
gcloud storage cp ${kcc_url} release-bundle.tar.gz
tar zxvf release-bundle.tar.gz
kubectl apply -f operator-system/configconnector-operator.yaml

Expand Down
2 changes: 1 addition & 1 deletion hack/create-dev-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [[ -z ${EXTRA_TAG+x} ]]; then
EXTRA_TAG=""
fi

if ! gsutil ls "gs://${bucket}/${VERSION}" > /dev/null 2>&1; then
if ! gcloud storage ls "gs://${bucket}/${VERSION}" > /dev/null 2>&1; then
>&2 gcloud builds submit . \
"--project=${project_id}" \
--config=cmd/generate-release/cloudbuild.yaml \
Expand Down
2 changes: 1 addition & 1 deletion hack/deploy-dev-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ git submodule update --init --recursive

gcloud builds submit \
--no-source \
--config=<(gsutil cat "gs://${release}/cloud-build/fresh-cluster.yaml") \
--config=<(gcloud storage cat "gs://${release}/cloud-build/fresh-cluster.yaml") \
--substitutions="_CLOUDSDK_COMPUTE_ZONE=${zone},_CLOUDSDK_CONTAINER_CLUSTER=${cluster_name},_MACHINE_TYPE=${machine},_ASM_MANAGED=${asm_managed}"

gcloud container clusters get-credentials "${cluster_name}" --zone "${zone}"
8 changes: 4 additions & 4 deletions hack/prow/e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ release_id="$(date +%s)-$(git rev-parse --short $git_sha)"

# Determine the path to export results to and store the latest release ID
export_path=gs://${_EXPORT_BUCKET}/logs/${_EXPORT_JOB_NAME}/$release_id
[ ! -z "${_EXPORT_BUCKET}" ] && echo $release_id | gsutil cp - gs://${_EXPORT_BUCKET}/logs/${_EXPORT_JOB_NAME}/latest-build.txt
[ ! -z "${_EXPORT_BUCKET}" ] && echo $release_id | gcloud storage cp - gs://${_EXPORT_BUCKET}/logs/${_EXPORT_JOB_NAME}/latest-build.txt

# Write 'started.json' to report start of job to testgrid
[ ! -z "${_EXPORT_BUCKET}" ] && jq -n \
Expand All @@ -51,7 +51,7 @@ export_path=gs://${_EXPORT_BUCKET}/logs/${_EXPORT_JOB_NAME}/$release_id
--arg "${_EXPORT_REPO}" $git_sha \
'$ARGS.named' \
)" \
'$ARGS.named' | gsutil cp - ${export_path}/started.json
'$ARGS.named' | gcloud storage cp - ${export_path}/started.json

# Install exit hook to write 'finished.json' to report results to testgrid
RESULT="FAILURE"
Expand All @@ -69,8 +69,8 @@ function finish {
--arg "Build" "$BUILD_ID" \
'$ARGS.named' \
)" \
'$ARGS.named' | gsutil cp - ${export_path}/finished.json
gsutil cp ./build-log.txt ${export_path}/build-log.txt
'$ARGS.named' | gcloud storage cp - ${export_path}/finished.json
gcloud storage cp ./build-log.txt ${export_path}/build-log.txt
fi
}
trap finish EXIT
Expand Down