Separate master and branch test logs

cisco66666 · peng · web-flow · commit 4f218e442cd2 · 2020-05-09T21:04:58.000+08:00
Co-authored-by: peng &lt;peng@example.com&gt;
diff --git a/test/conference.jenkinsfile b/test/conference.jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
 
                             node('api-js-centos-'+env.GIT_BRANCH) {
                                 container('test-images') {
-                                    sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1"
+                                    sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"
                                 }
                             }
                         }
@@ -86,7 +86,7 @@ pipeline {
 
                             node('rest-js-centos-'+env.GIT_BRANCH) {
                                 container('test-images') {
-                                    sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2"
+                                    sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"
                                 }
                             }
                         }
diff --git a/test/ubuntuconference.jenkinsfile b/test/ubuntuconference.jenkinsfile
@@ -65,7 +65,7 @@ pipeline {
 
                             node('api-js-ubuntu-'+env.GIT_BRANCH) {
                                 container('test-images') {
-                                   sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1"
+                                   sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"
                                 }
                             }
                         }
@@ -85,7 +85,7 @@ pipeline {
 
                             node('rest-js-ubuntu-'+env.GIT_BRANCH) {
                                 container('test-images') {
-                                   sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2"
+                                   sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"
                                 }
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ pipeline {`
`66`	`66`
`67`	`67`	`node('api-js-centos-'+env.GIT_BRANCH) {`
`68`	`68`	`container('test-images') {`
`69`		`- sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1"`
	`69`	`+ sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -86,7 +86,7 @@ pipeline {`
`86`	`86`
`87`	`87`	`node('rest-js-centos-'+env.GIT_BRANCH) {`
`88`	`88`	`container('test-images') {`
`89`		`- sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2"`
	`89`	`+ sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ pipeline {`
`65`	`65`
`66`	`66`	`node('api-js-ubuntu-'+env.GIT_BRANCH) {`
`67`	`67`	`container('test-images') {`
`68`		`- sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1"`
	`68`	`+ sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`@@ -85,7 +85,7 @@ pipeline {`
`85`	`85`
`86`	`86`	`node('rest-js-ubuntu-'+env.GIT_BRANCH) {`
`87`	`87`	`container('test-images') {`
`88`		`- sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2"`
	`88`	`+ sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`