Jenkins check-in test fix logs (#501)

cisco66666 · web-flow · commit 104a27fd35a2 · 2020-05-09T19:11:56.000+08:00
diff --git a/test/server.jenkinsfile b/test/server.jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
                             ]) {
                             node('api-server-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"
                                 }
                             }
                         }
@@ -74,7 +74,7 @@ pipeline {
                             ]) {
                             node('rest-server-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"
                                 }
                             }
                         }
@@ -93,7 +93,7 @@ pipeline {
         success {
             script {
                 if ("${GIT_BRANCH}" == 'master') {
-                   sh "curl ${env.checkServerUrl}/copyNightly/${GIT_COMMIT}/owt-server/1"
+                   sh "curl ${env.checkServerUrl}/copyNightly/0${GIT_COMMIT}/owt-server/1"
         }
         }
             setBuildStatus("Build succeeded", "SUCCESS");
diff --git a/test/ubuntuserver.jenkinsfile b/test/ubuntuserver.jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
                             containerTemplate(name: 'test-images', image: "$env.ubuntu_test_images",  ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', resourceRequestMemory: '2.0Gi', resourceLimitMemory: '3.0Gi', command: 'cat'),                            ]) {
                             node('api-server-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"
                                 }
                             }
                         }
@@ -73,7 +73,7 @@ pipeline {
                             ]) {
                             node('rest-server-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"
                                 }
                             }
                         }
@@ -95,7 +95,7 @@ pipeline {
         success {
             script {
                 if ("${GIT_BRANCH}" == 'master') {
-                   sh "curl ${env.checkServerUrl}/copyNightly/${GIT_COMMIT}/owt-server/0"
+                   sh "curl ${env.checkServerUrl}/copyNightly/0${GIT_COMMIT}/owt-server/0"
         }
         }
             setBuildStatus("Build succeeded", "SUCCESS");

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ pipeline {`
`55`	`55`	`]) {`
`56`	`56`	`node('api-server-centos-'+env.GIT_BRANCH) {`
`57`	`57`	`container('test-images') {`
`58`		`- sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1"`
	`58`	`+ sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -74,7 +74,7 @@ pipeline {`
`74`	`74`	`]) {`
`75`	`75`	`node('rest-server-centos-'+env.GIT_BRANCH) {`
`76`	`76`	`container('test-images') {`
`77`		`- sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2"`
	`77`	`+ sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -93,7 +93,7 @@ pipeline {`
`93`	`93`	`success {`
`94`	`94`	`script {`
`95`	`95`	`if ("${GIT_BRANCH}" == 'master') {`
`96`		`- sh "curl ${env.checkServerUrl}/copyNightly/${GIT_COMMIT}/owt-server/1"`
	`96`	`+ sh "curl ${env.checkServerUrl}/copyNightly/0${GIT_COMMIT}/owt-server/1"`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`setBuildStatus("Build succeeded", "SUCCESS");`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ pipeline {`
`54`	`54`	`containerTemplate(name: 'test-images', image: "$env.ubuntu_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', resourceRequestMemory: '2.0Gi', resourceLimitMemory: '3.0Gi', command: 'cat'), ]) {`
`55`	`55`	`node('api-server-ubuntu-'+env.GIT_BRANCH) {`
`56`	`56`	`container('test-images') {`
`57`		`- sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1"`
	`57`	`+ sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1 $env.GIT_BRANCH"`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -73,7 +73,7 @@ pipeline {`
`73`	`73`	`]) {`
`74`	`74`	`node('rest-server-ubuntu-'+env.GIT_BRANCH) {`
`75`	`75`	`container('test-images') {`
`76`		`- sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2"`
	`76`	`+ sh "/root/startRun.sh * * ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2 $env.GIT_BRANCH"`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -95,7 +95,7 @@ pipeline {`
`95`	`95`	`success {`
`96`	`96`	`script {`
`97`	`97`	`if ("${GIT_BRANCH}" == 'master') {`
`98`		`- sh "curl ${env.checkServerUrl}/copyNightly/${GIT_COMMIT}/owt-server/0"`
	`98`	`+ sh "curl ${env.checkServerUrl}/copyNightly/0${GIT_COMMIT}/owt-server/0"`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`setBuildStatus("Build succeeded", "SUCCESS");`