github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix GCS permissions and file moving bugs

Browse Source
This commit is contained in:
Marie Shaw 2016-08-17 13:32:55 -07:00
parent c8591c710b
commit f7e2109b8b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/make-rules/test-e2e-node.sh
View File

@ -79,6 +79,11 @@ fi
if [ $remote = true ] ; then if [ $remote = true ] ; then
# Setup the directory to copy test artifacts (logs, junit.xml, etc) from remote host to local host # Setup the directory to copy test artifacts (logs, junit.xml, etc) from remote host to local host
if [[ $gubernator = true && -d "${artifacts}" ]]; then
echo "Removing artifacts directory at ${artifacts}"
rm -r ${artifacts}
fi
if [ ! -d "${artifacts}" ]; then if [ ! -d "${artifacts}" ]; then
echo "Creating artifacts directory at ${artifacts}" echo "Creating artifacts directory at ${artifacts}"
mkdir -p ${artifacts} mkdir -p ${artifacts}

14
test/e2e_node/gubernator.sh
View File

@ -58,11 +58,14 @@ V=2 kube::log::status "Using bucket ${bucket_name}"
# Check if the bucket exists # Check if the bucket exists
if ! gsutil ls gs:// | grep -q "gs://${bucket_name}/"; then if ! gsutil ls gs:// | grep -q "gs://${bucket_name}/"; then
V=2 kube::log::status "Creating bucket ${bucket_name}" V=2 kube::log::status "Creating public bucket ${bucket_name}"
gsutil mb gs://${bucket_name}/ gsutil mb gs://${bucket_name}/
# Make all files in the bucket publicly readable
gsutil acl ch -u AllUsers:R gs://${bucket_name}
else else
V=2 kube::log::status "Bucket already exists" V=2 kube::log::status "Bucket already exists"
fi fi
# Path for e2e-node test results # Path for e2e-node test results
GCS_JOBS_PATH="gs://${bucket_name}/logs/e2e-node" GCS_JOBS_PATH="gs://${bucket_name}/logs/e2e-node"
@ -105,10 +108,11 @@ if gsutil ls "${GCS_JOBS_PATH}" | grep -q "${BUILD_STAMP}"; then
exit exit
fi fi
results=$(find ${ARTIFACTS} -type d -name "results") for result in $(find ${ARTIFACTS} -type d -name "results"); do
if [[ $results != "" && $results != "${ARTIFACTS}/results" && $results != $ARTIFACTS ]]; then if [[ $result != "" && $result != "${ARTIFACTS}/results" && $result != $ARTIFACTS ]]; then
mv $results $ARTIFACTS mv $result/* $ARTIFACTS
fi fi
done
# Upload log files # Upload log files
for upload_attempt in $(seq 3); do for upload_attempt in $(seq 3); do