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

Merge pull request #42859 from Random-Liu/change-junit-format-in-node-e2e

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42811, 42859)

Change the junit file name format to `junit_image-name_id.xml`,

With this, the junit file name will be `junit_image-name_id.xml:
```
junit_containervm_id.xml
junit_coreos-alpha_id.xml
junit_gci_id.xml
junit_ubuntu-docker10_id.xml
junit_ubuntu-docker12_id.xml
```

The test infra team will use the `image-name` inside the junit file name and replace the original `[1] [2] [3] ..` with the actual image name.

This will make it a little bit easier for debugging.

/cc @dchen1107 @krzyzacy @kubernetes/sig-node-pr-reviews 
/cc @kubernetes/release-maintainers This is a minor test only change to make it easier to debug issues.
This commit is contained in:
Kubernetes Submit Queue 2017-03-09 18:47:55 -08:00 committed by GitHub
commit 6522344bb0
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/e2e_node_suite_test.go
View File

@ -114,7 +114,7 @@ func TestE2eNode(t *testing.T) {
glog.Errorf("Failed creating report directory: %v", err) glog.Errorf("Failed creating report directory: %v", err)
} else { } else {
// Configure a junit reporter to write to the directory // Configure a junit reporter to write to the directory
junitFile := fmt.Sprintf("junit_%s%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode) junitFile := fmt.Sprintf("junit_%s_%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode)
junitPath := path.Join(reportDir, junitFile) junitPath := path.Join(reportDir, junitFile)
reporters = append(reporters, morereporters.NewJUnitReporter(junitPath)) reporters = append(reporters, morereporters.NewJUnitReporter(junitPath))
} }

2
test/e2e_node/jenkins/cri_validation/image-config.yaml
View File

@ -2,7 +2,7 @@ images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci:
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2 image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
project: google-containers project: google-containers
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"

2
test/e2e_node/jenkins/image-config.yaml
View File

@ -15,7 +15,7 @@ images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci:
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2 image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
project: google-containers project: google-containers
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"

2
test/e2e_node/jenkins/non-cri_validation/image-config.yaml
View File

@ -2,7 +2,7 @@ images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci:
image_regex: gci-beta-56-9000-80-0 # docker 1.11.2 image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
project: google-containers project: google-containers
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"

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

@ -198,8 +198,9 @@ func main() {
machine: imageConfig.Machine, machine: imageConfig.Machine,
tests: imageConfig.Tests, tests: imageConfig.Tests,
} }
if isRegex { if isRegex && len(images) > 1 {
name = shortName + "-" + image // Use image name when shortName is not unique.
name = image
} }
gceImages.images[name] = gceImage gceImages.images[name] = gceImage
} }