github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Allow passing image description from e2e node test config

Browse Source
This commit is contained in:
Yang Guo 2017-08-14 17:11:05 -07:00
parent bc1a58ae3a
commit 1fb12b84dd
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View File

@ -113,6 +113,7 @@ images:
- 'resource tracking for 105 pods per node \[Benchmark\]' - 'resource tracking for 105 pods per node \[Benchmark\]'
cos-docker112-resource1: cos-docker112-resource1:
image: cos-stable-60-9592-76-0 image: cos-stable-60-9592-76-0
image_description: cos-stable-60-9592-76-0 with docker 1.12.6
project: cos-cloud project: cos-cloud
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6" metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6"
@ -120,6 +121,7 @@ images:
- 'resource tracking for 0 pods per node \[Benchmark\]' - 'resource tracking for 0 pods per node \[Benchmark\]'
cos-docker112-resource2: cos-docker112-resource2:
image: cos-stable-60-9592-76-0 image: cos-stable-60-9592-76-0
image_description: cos-stable-60-9592-76-0 with docker 1.12.6
project: cos-cloud project: cos-cloud
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6" metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6"
@ -127,6 +129,7 @@ images:
- 'resource tracking for 35 pods per node \[Benchmark\]' - 'resource tracking for 35 pods per node \[Benchmark\]'
cos-docker112-resource3: cos-docker112-resource3:
image: cos-stable-60-9592-76-0 image: cos-stable-60-9592-76-0
image_description: cos-stable-60-9592-76-0 with docker 1.12.6
project: cos-cloud project: cos-cloud
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6" metadata: "user-data<test/e2e_node/jenkins/cos-init-docker.yaml,gci-update-strategy=update_disabled,gci-docker-version=1.12.6"

2
test/e2e_node/remote/node_e2e.go
View File

@ -211,7 +211,7 @@ func (n *NodeE2ERemote) RunTest(host, workspace, results, imageDesc, junitFilePr
glog.V(2).Infof("Starting tests on %q", host) glog.V(2).Infof("Starting tests on %q", host)
cmd := getSSHCommand(" && ", cmd := getSSHCommand(" && ",
fmt.Sprintf("cd %s", workspace), fmt.Sprintf("cd %s", workspace),
fmt.Sprintf("timeout -k 30s %fs ./ginkgo %s ./e2e_node.test -- --system-spec-name=%s --system-spec-file=%s --logtostderr --v 4 --node-name=%s --report-dir=%s --report-prefix=%s --image-description=%s %s", fmt.Sprintf("timeout -k 30s %fs ./ginkgo %s ./e2e_node.test -- --system-spec-name=%s --system-spec-file=%s --logtostderr --v 4 --node-name=%s --report-dir=%s --report-prefix=%s --image-description=\"%s\" %s",
timeout.Seconds(), ginkgoArgs, systemSpecName, systemSpecFile, host, results, junitFilePrefix, imageDesc, testArgs), timeout.Seconds(), ginkgoArgs, systemSpecName, systemSpecFile, host, results, junitFilePrefix, imageDesc, testArgs),
) )
return SSH(host, "sh", "-c", cmd) return SSH(host, "sh", "-c", cmd)

10
test/e2e_node/runner/remote/run_remote.go
View File

@ -113,6 +113,7 @@ type Resources struct {
type GCEImage struct { type GCEImage struct {
Image string `json:"image, omitempty"` Image string `json:"image, omitempty"`
ImageDesc string `json:"image_description, omitempty"`
Project string `json:"project"` Project string `json:"project"`
Metadata string `json:"metadata"` Metadata string `json:"metadata"`
ImageRegex string `json:"image_regex, omitempty"` ImageRegex string `json:"image_regex, omitempty"`
@ -132,6 +133,9 @@ type internalImageConfig struct {
type internalGCEImage struct { type internalGCEImage struct {
image string image string
// imageDesc is the description of the image. If empty, the value in the
// 'image' will be used.
imageDesc string
project string project string
resources Resources resources Resources
metadata *compute.Metadata metadata *compute.Metadata
@ -206,12 +210,16 @@ func main() {
for _, image := range images { for _, image := range images {
gceImage := internalGCEImage{ gceImage := internalGCEImage{
image: image, image: image,
imageDesc: imageConfig.ImageDesc,
project: imageConfig.Project, project: imageConfig.Project,
metadata: getImageMetadata(imageConfig.Metadata), metadata: getImageMetadata(imageConfig.Metadata),
machine: imageConfig.Machine, machine: imageConfig.Machine,
tests: imageConfig.Tests, tests: imageConfig.Tests,
resources: imageConfig.Resources, resources: imageConfig.Resources,
} }
if gceImage.imageDesc == "" {
gceImage.imageDesc = gceImage.image
}
if isRegex && len(images) > 1 { if isRegex && len(images) > 1 {
// Use image name when shortName is not unique. // Use image name when shortName is not unique.
name = image name = image
@ -485,7 +493,7 @@ func testImage(imageConfig *internalGCEImage, junitFilePrefix string) *TestResul
// If we are going to delete the instance, don't bother with cleaning up the files // If we are going to delete the instance, don't bother with cleaning up the files
deleteFiles := !*deleteInstances && *cleanup deleteFiles := !*deleteInstances && *cleanup
result := testHost(host, deleteFiles, imageConfig.image, junitFilePrefix, ginkgoFlagsStr) result := testHost(host, deleteFiles, imageConfig.imageDesc, junitFilePrefix, ginkgoFlagsStr)
// This is a temporary solution to collect serial node serial log. Only port 1 contains useful information. // This is a temporary solution to collect serial node serial log. Only port 1 contains useful information.
// TODO(random-liu): Extract out and unify log collection logic with cluste e2e. // TODO(random-liu): Extract out and unify log collection logic with cluste e2e.
serialPortOutput, err := computeService.Instances.GetSerialPortOutput(*project, *zone, host).Port(1).Do() serialPortOutput, err := computeService.Instances.GetSerialPortOutput(*project, *zone, host).Port(1).Do()