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
c2d1a325
Commit
c2d1a325
authored
Aug 22, 2016
by
Zhou Fang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skip benchmark in jenkins serial test
parent
d6afd304
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
jenkins-serial.properties
test/e2e_node/jenkins/jenkins-serial.properties
+1
-1
run_e2e.go
test/e2e_node/runner/run_e2e.go
+4
-1
No files found.
test/e2e_node/jenkins/jenkins-serial.properties
View file @
c2d1a325
...
@@ -3,7 +3,7 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
...
@@ -3,7 +3,7 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
GCE_ZONE
=
us-central1-f
GCE_ZONE
=
us-central1-f
GCE_PROJECT
=
k8s-jkns-ci-node-e2e
GCE_PROJECT
=
k8s-jkns-ci-node-e2e
CLEANUP
=
true
CLEANUP
=
true
GINKGO_FLAGS
=
'--focus="\[Serial\]" --skip="\[Flaky\]"'
GINKGO_FLAGS
=
'--focus="\[Serial\]" --skip="\[Flaky\]
|\[Benchmark\]
"'
SETUP_NODE
=
false
SETUP_NODE
=
false
# DISABLED --cgroups-per-qos flag until feature stabilized.
# DISABLED --cgroups-per-qos flag until feature stabilized.
#TEST_ARGS=--cgroups-per-qos=false
#TEST_ARGS=--cgroups-per-qos=false
...
...
test/e2e_node/runner/run_e2e.go
View file @
c2d1a325
...
@@ -110,7 +110,7 @@ type GCEImage struct {
...
@@ -110,7 +110,7 @@ type GCEImage struct {
PreviousImages
int
`json:"previous_images, omitempty"`
PreviousImages
int
`json:"previous_images, omitempty"`
Machine
string
`json:"machine, omitempty"`
Machine
string
`json:"machine, omitempty"`
// Th
e test is regarded as 'benchmark' is Tests is non-empty
// Th
is test is for benchmark (no limit verification, more result log, node name has format 'machine-image-uuid') if 'Tests' is non-empty.
Tests
[]
string
`json:"tests, omitempty"`
Tests
[]
string
`json:"tests, omitempty"`
}
}
...
@@ -591,6 +591,8 @@ func imageToInstanceName(imageConfig *internalGCEImage) string {
...
@@ -591,6 +591,8 @@ func imageToInstanceName(imageConfig *internalGCEImage) string {
if
imageConfig
.
machine
==
""
{
if
imageConfig
.
machine
==
""
{
return
*
instanceNamePrefix
+
"-"
+
imageConfig
.
image
return
*
instanceNamePrefix
+
"-"
+
imageConfig
.
image
}
}
// For benchmark test, node name has the format 'machine-image-uuid'.
// Node name is added to test data item labels and used for benchmark dashboard.
return
imageConfig
.
machine
+
"-"
+
imageConfig
.
image
+
"-"
+
uuid
.
NewUUID
()
.
String
()[
:
8
]
return
imageConfig
.
machine
+
"-"
+
imageConfig
.
image
+
"-"
+
uuid
.
NewUUID
()
.
String
()[
:
8
]
}
}
...
@@ -605,6 +607,7 @@ func machineType(machine string) string {
...
@@ -605,6 +607,7 @@ func machineType(machine string) string {
return
fmt
.
Sprintf
(
"zones/%s/machineTypes/%s"
,
*
zone
,
machine
)
return
fmt
.
Sprintf
(
"zones/%s/machineTypes/%s"
,
*
zone
,
machine
)
}
}
// testsToGinkgoFocus converts the test string list to Ginkgo focus
func
testsToGinkgoFocus
(
tests
[]
string
)
string
{
func
testsToGinkgoFocus
(
tests
[]
string
)
string
{
focus
:=
"--focus=
\"
"
focus
:=
"--focus=
\"
"
for
i
,
test
:=
range
tests
{
for
i
,
test
:=
range
tests
{
...
...
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