Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f7e2109b
Commit
f7e2109b
authored
Aug 17, 2016
by
Marie Shaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GCS permissions and file moving bugs
parent
c8591c71
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
test-e2e-node.sh
hack/make-rules/test-e2e-node.sh
+5
-0
gubernator.sh
test/e2e_node/gubernator.sh
+9
-5
No files found.
hack/make-rules/test-e2e-node.sh
View file @
f7e2109b
...
@@ -79,6 +79,11 @@ fi
...
@@ -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
}
...
...
test/e2e_node/gubernator.sh
View file @
f7e2109b
...
@@ -58,11 +58,14 @@ V=2 kube::log::status "Using bucket ${bucket_name}"
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment