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
391ff9db
Commit
391ff9db
authored
Apr 11, 2016
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #24105 from ixdy/dirty-workspace
Remove "dirty workspace" check in e2e-runner.sh
parents
94d4a3ec
1816582f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
20 deletions
+0
-20
e2e-runner.sh
hack/jenkins/e2e-runner.sh
+0
-20
No files found.
hack/jenkins/e2e-runner.sh
View file @
391ff9db
...
@@ -25,24 +25,6 @@ function running_in_docker() {
...
@@ -25,24 +25,6 @@ function running_in_docker() {
grep
-q
docker /proc/self/cgroup
grep
-q
docker /proc/self/cgroup
}
}
function
check_dirty_workspace
()
{
if
[[
"
${
JENKINS_TOLERATE_DIRTY_WORKSPACE
:-}
"
=
~ ^[yY]
$
]]
;
then
echo
"Tolerating dirty workspace (because JENKINS_TOLERATE_DIRTY_WORKSPACE)."
else
echo
"Checking dirty workspace."
# .config and its children are created by the gcloud call that we use to
# get the GCE service account.
#
# console-log.txt is created by Jenkins, but is usually not flushed out
# this early in this script.
if
[[
$(
find
.
-not
-path
"./.config*"
-not
-name
"console-log.txt"
|
wc
-l
)
!=
1
]]
;
then
echo
"
${
PWD
}
not empty, bailing!"
find
.
exit
1
fi
fi
}
function
fetch_output_tars
()
{
function
fetch_output_tars
()
{
clean_binaries
clean_binaries
echo
"Using binaries from _output."
echo
"Using binaries from _output."
...
@@ -225,12 +207,10 @@ elif [[ "${KUBE_RUN_FROM_OUTPUT:-}" =~ ^[yY]$ ]]; then
...
@@ -225,12 +207,10 @@ elif [[ "${KUBE_RUN_FROM_OUTPUT:-}" =~ ^[yY]$ ]]; then
elif
[[
"
${
JENKINS_USE_SERVER_VERSION
:-}
"
=
~ ^[yY]
$
]]
;
then
elif
[[
"
${
JENKINS_USE_SERVER_VERSION
:-}
"
=
~ ^[yY]
$
]]
;
then
# This is for test, staging, and prod jobs on GKE, where we want to
# This is for test, staging, and prod jobs on GKE, where we want to
# test what's running in GKE by default rather than some CI build.
# test what's running in GKE by default rather than some CI build.
check_dirty_workspace
fetch_server_version_tars
fetch_server_version_tars
else
else
# use JENKINS_PUBLISHED_VERSION, default to 'ci/latest', since that's
# use JENKINS_PUBLISHED_VERSION, default to 'ci/latest', since that's
# usually what we're testing.
# usually what we're testing.
check_dirty_workspace
fetch_published_version_tars
"
${
JENKINS_PUBLISHED_VERSION
:-
ci
/latest
}
"
fetch_published_version_tars
"
${
JENKINS_PUBLISHED_VERSION
:-
ci
/latest
}
"
fi
fi
...
...
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