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
2fa3568c
Commit
2fa3568c
authored
Dec 18, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18844 from spxtr/e2e-cleanup
Auto commit by PR queue bot
parents
7f5123f6
73d1c4d7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
9 deletions
+1
-9
e2e.sh
hack/jenkins/e2e.sh
+1
-9
No files found.
hack/jenkins/e2e.sh
View file @
2fa3568c
...
@@ -1141,7 +1141,6 @@ export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-}
...
@@ -1141,7 +1141,6 @@ export TEST_CLUSTER_LOG_LEVEL=${TEST_CLUSTER_LOG_LEVEL:-}
export
TEST_CLUSTER_RESYNC_PERIOD
=
${
TEST_CLUSTER_RESYNC_PERIOD
:-}
export
TEST_CLUSTER_RESYNC_PERIOD
=
${
TEST_CLUSTER_RESYNC_PERIOD
:-}
export
PROJECT
=
${
PROJECT
:-}
export
PROJECT
=
${
PROJECT
:-}
export
NETWORK_PROVIDER
=
${
NETWORK_PROVIDER
:-}
export
NETWORK_PROVIDER
=
${
NETWORK_PROVIDER
:-}
export
JENKINS_EXPLICIT_VERSION
=
${
JENKINS_EXPLICIT_VERSION
:-}
export
JENKINS_PUBLISHED_VERSION
=
${
JENKINS_PUBLISHED_VERSION
:-
'ci/latest'
}
export
JENKINS_PUBLISHED_VERSION
=
${
JENKINS_PUBLISHED_VERSION
:-
'ci/latest'
}
export
KUBE_ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-}
export
KUBE_ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-}
...
@@ -1225,14 +1224,7 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the
...
@@ -1225,14 +1224,7 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the
gcloud components update beta
-q
||
true
gcloud components update beta
-q
||
true
)
9>/var/run/lock/gcloud-components.lock
)
9>/var/run/lock/gcloud-components.lock
if
[[
!
-z
${
JENKINS_EXPLICIT_VERSION
:-}
]]
;
then
if
[[
${
JENKINS_USE_SERVER_VERSION
:-}
=
~ ^[yY]
$
]]
;
then
# Use an explicit pinned version like "ci/v0.10.0-101-g6c814c4" or
# "release/v0.19.1"
IFS
=
'/'
read
-a
varr
<<<
"
${
JENKINS_EXPLICIT_VERSION
}
"
bucket
=
"
${
varr
[0]
}
"
build_version
=
"
${
varr
[1]
}
"
echo
"Using explicit version
$bucket
/
$build_version
"
elif
[[
${
JENKINS_USE_SERVER_VERSION
:-}
=
~ ^[yY]
$
]]
;
then
# for GKE we can use server default version.
# for GKE we can use server default version.
bucket
=
"release"
bucket
=
"release"
msg
=
$(
gcloud
${
CMD_GROUP
}
container get-server-config
--project
=
${
PROJECT
}
--zone
=
${
ZONE
}
|
grep
defaultClusterVersion
)
msg
=
$(
gcloud
${
CMD_GROUP
}
container get-server-config
--project
=
${
PROJECT
}
--zone
=
${
ZONE
}
|
grep
defaultClusterVersion
)
...
...
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