mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Change the junit file name format to junit_image-name_id.xml
,
and make the gci image name shorter.
This commit is contained in:
parent
1f5708d460
commit
f81460e35d
@ -114,7 +114,7 @@ func TestE2eNode(t *testing.T) {
|
||||
glog.Errorf("Failed creating report directory: %v", err)
|
||||
} else {
|
||||
// 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)
|
||||
reporters = append(reporters, morereporters.NewJUnitReporter(junitPath))
|
||||
}
|
||||
|
@ -2,7 +2,7 @@ images:
|
||||
containervm:
|
||||
image: e2e-node-containervm-v20161208-image # docker 1.11.2
|
||||
project: kubernetes-node-e2e-images
|
||||
gci-family:
|
||||
gci:
|
||||
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
|
||||
project: google-containers
|
||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||
|
@ -15,7 +15,7 @@ images:
|
||||
containervm:
|
||||
image: e2e-node-containervm-v20161208-image # docker 1.11.2
|
||||
project: kubernetes-node-e2e-images
|
||||
gci-family:
|
||||
gci:
|
||||
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
|
||||
project: google-containers
|
||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||
|
@ -2,7 +2,7 @@ images:
|
||||
containervm:
|
||||
image: e2e-node-containervm-v20161208-image # docker 1.11.2
|
||||
project: kubernetes-node-e2e-images
|
||||
gci-family:
|
||||
gci:
|
||||
image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
|
||||
project: google-containers
|
||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||
|
@ -198,8 +198,9 @@ func main() {
|
||||
machine: imageConfig.Machine,
|
||||
tests: imageConfig.Tests,
|
||||
}
|
||||
if isRegex {
|
||||
name = shortName + "-" + image
|
||||
if isRegex && len(images) > 1 {
|
||||
// Use image name when shortName is not unique.
|
||||
name = image
|
||||
}
|
||||
gceImages.images[name] = gceImage
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user