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

Merge pull request #38845 from Random-Liu/fix-node-conformance-report-prefix

Browse Source 
Automatic merge from submit-queue

Node Conformance Test: Fix report prefix for node conformance test.

The node conformance CI is running now.

The only problem is that junit files overwrite each other because of the lack of junit prefix. http://gcsweb.k8s.io/gcs/kubernetes-jenkins/logs/ci-kubernetes-node-kubelet-conformance/42/artifacts/

This PR fixes this. I've verified in my environment, it works well.

@timstclair
This commit is contained in:
Kubernetes Submit Queue
2016-12-15 18:45:03 -08:00
committed by GitHub
parent 15059e6a5b c57f2ec064
commit 5ec2fb0bcc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/remote/node_conformance.go
View File

@@ -287,8 +287,8 @@ func (c *ConformanceRemote) RunTest(host, workspace, results, junitFilePrefix, t
// Run the tests
glog.V(2).Infof("Starting tests on %q", host)
podManifestPath := getPodManifestPath(workspace)
cmd := fmt.Sprintf("'timeout -k 30s %fs docker run --rm --privileged=true --net=host -v /:/rootfs -v %s:%s -v %s:/var/result %s'",
timeout.Seconds(), podManifestPath, podManifestPath, results, getConformanceImageRepo())
cmd := fmt.Sprintf("'timeout -k 30s %fs docker run --rm --privileged=true --net=host -v /:/rootfs -v %s:%s -v %s:/var/result -e TEST_ARGS=--report-prefix=%s %s'",
timeout.Seconds(), podManifestPath, podManifestPath, results, junitFilePrefix, getConformanceImageRepo())
testOutput, err := SSH(host, "sh", "-c", cmd)
if err != nil {
return testOutput, err