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
82f588b4
Commit
82f588b4
authored
May 23, 2017
by
Random-Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cos image project to cos-cloud.
parent
f8815c96
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
test-e2e-node.sh
hack/make-rules/test-e2e-node.sh
+2
-2
benchmark-config.yaml
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
+3
-3
image-config.yaml
test/e2e_node/jenkins/image-config.yaml
+1
-1
No files found.
hack/make-rules/test-e2e-node.sh
View file @
82f588b4
...
@@ -73,9 +73,9 @@ if [ $remote = true ] ; then
...
@@ -73,9 +73,9 @@ if [ $remote = true ] ; then
gubernator
=
${
GUBERNATOR
:-
"false"
}
gubernator
=
${
GUBERNATOR
:-
"false"
}
image_config_file
=
${
IMAGE_CONFIG_FILE
:-
""
}
image_config_file
=
${
IMAGE_CONFIG_FILE
:-
""
}
if
[[
$hosts
==
""
&&
$images
==
""
&&
$image_config_file
==
""
]]
;
then
if
[[
$hosts
==
""
&&
$images
==
""
&&
$image_config_file
==
""
]]
;
then
image_project
=
${
IMAGE_PROJECT
:-
"
google-containers
"
}
image_project
=
${
IMAGE_PROJECT
:-
"
cos-cloud
"
}
gci_image
=
$(
gcloud compute images list
--project
$image_project
\
gci_image
=
$(
gcloud compute images list
--project
$image_project
\
--no-standard-images
--regexp
=
"
gci-dev
.*"
--format
=
"table[no-heading](name)"
)
--no-standard-images
--regexp
=
"
cos-beta
.*"
--format
=
"table[no-heading](name)"
)
images
=
$gci_image
images
=
$gci_image
metadata
=
"user-data<
${
KUBE_ROOT
}
/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
metadata
=
"user-data<
${
KUBE_ROOT
}
/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
fi
fi
...
...
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View file @
82f588b4
...
@@ -50,21 +50,21 @@ images:
...
@@ -50,21 +50,21 @@ images:
-
'
resource
tracking
for
105
pods
per
node
\[Benchmark\]'
-
'
resource
tracking
for
105
pods
per
node
\[Benchmark\]'
gci-resource1
:
gci-resource1
:
image
:
cos-beta-59-9460-20-0
image
:
cos-beta-59-9460-20-0
project
:
google-containers
project
:
cos-cloud
machine
:
n1-standard-1
machine
:
n1-standard-1
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests
:
tests
:
-
'
resource
tracking
for
0
pods
per
node
\[Benchmark\]'
-
'
resource
tracking
for
0
pods
per
node
\[Benchmark\]'
gci-resource2
:
gci-resource2
:
image
:
cos-beta-59-9460-20-0
image
:
cos-beta-59-9460-20-0
project
:
google-containers
project
:
cos-cloud
machine
:
n1-standard-1
machine
:
n1-standard-1
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests
:
tests
:
-
'
resource
tracking
for
35
pods
per
node
\[Benchmark\]'
-
'
resource
tracking
for
35
pods
per
node
\[Benchmark\]'
gci-resource3
:
gci-resource3
:
image
:
cos-beta-59-9460-20-0
image
:
cos-beta-59-9460-20-0
project
:
google-containers
project
:
cos-cloud
machine
:
n1-standard-1
machine
:
n1-standard-1
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests
:
tests
:
...
...
test/e2e_node/jenkins/image-config.yaml
View file @
82f588b4
...
@@ -17,5 +17,5 @@ images:
...
@@ -17,5 +17,5 @@ images:
project
:
kubernetes-node-e2e-images
project
:
kubernetes-node-e2e-images
gci
:
gci
:
image_regex
:
cos-beta-59-9460-20-0
# docker 1.11.2
image_regex
:
cos-beta-59-9460-20-0
# docker 1.11.2
project
:
google-containers
project
:
cos-cloud
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
metadata
:
"
user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
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