Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 1b09e28

Browse files
GaoMingKaiGaoMingKai
authored
Fix stage name (#330)
* add simucast stage * fix pipeline cpu config * fix config cpu * fix stagee name
1 parent a30adef commit 1b09e28

File tree

2 files changed

+54
-8
lines changed

2 files changed

+54
-8
lines changed

‎test/conference.jenkinsfile‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pipeline {
5353
stage('Start test') {
5454
options { timeout(time: 40, unit: 'MINUTES') }
5555
parallel {
56-
stage('API test') {
56+
stage('ConferenceClient API 1') {
5757
steps {
5858
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes',
5959
volumes: [
@@ -71,14 +71,14 @@ pipeline {
7171

7272
node('api-test') {
7373
container('api-test') {
74-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_api"
74+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_API_1"
7575
}
7676
}
7777
}
7878
}
7979
}
8080

81-
stage('Subscribe test') {
81+
stage('ConferenceClient API 2') {
8282
steps {
8383
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes',
8484
volumes: [
@@ -96,7 +96,30 @@ pipeline {
9696

9797
node('subscribe-test') {
9898
container('subscribe-test') {
99-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_subscribe"
99+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_API_2"
100+
}
101+
}
102+
}
103+
}
104+
}
105+
stage('ConferenceClient API 3') {
106+
steps {
107+
podTemplate(name:'simucast-test-server', label: 'simucast-test-server', cloud: 'kubernetes',
108+
volumes: [
109+
persistentVolumeClaim(claimName: 'js-centos-package', mountPath: '/root/centos_package', readOnly: false),
110+
persistentVolumeClaim(claimName: 'audio-lib', mountPath: '/root/audio_lib',readOnly: false),
111+
persistentVolumeClaim(claimName: 'recording-lib', mountPath: '/root/recording_lib',readOnly: false),
112+
persistentVolumeClaim(claimName: 'sip-lib', mountPath: '/root/sip_lib',readOnly: false),
113+
persistentVolumeClaim(claimName: 'streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
114+
persistentVolumeClaim(claimName: 'video-lib', mountPath: '/root/video_lib',readOnly: false),
115+
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
116+
],
117+
containers: [
118+
containerTemplate(name: 'simucast-test-server', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '2000m', resourceLimitCpu: '6000m',resourceLimitMemory: '9.0Gi', resourceRequestMemory: '8.0Gi', network: 'host', command: 'cat'),
119+
]) {
120+
node('simucast-test-server') {
121+
container('simucast-test-server') {
122+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_API_3"
100123
}
101124
}
102125
}

‎test/ubuntuconference.jenkinsfile‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pipeline {
5353
stage('Start test') {
5454
options { timeout(time: 40, unit: 'MINUTES') }
5555
parallel {
56-
stage('API test') {
56+
stage('ConferenceClient API 1') {
5757
steps {
5858
podTemplate(name: 'api-test-ubuntu', label: 'api-test-ubuntu', cloud: 'kubernetes',
5959
volumes: [
@@ -71,14 +71,14 @@ pipeline {
7171

7272
node('api-test-ubuntu') {
7373
container('api-test-ubuntu') {
74-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_api"
74+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_1"
7575
}
7676
}
7777
}
7878
}
7979
}
8080

81-
stage('Subscribe test') {
81+
stage('ConferenceClient API 2') {
8282
steps {
8383
podTemplate(name: 'subscribe-test-ubuntu', label: 'subscribe-test-ubuntu', cloud: 'kubernetes',
8484
volumes: [
@@ -96,7 +96,30 @@ pipeline {
9696

9797
node('subscribe-test-ubuntu') {
9898
container('subscribe-test-ubuntu') {
99-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_subscribe"
99+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_2"
100+
}
101+
}
102+
}
103+
}
104+
}
105+
stage('ConferenceClient API 3') {
106+
steps {
107+
podTemplate(name:'simucast-test-ubuntu', label: 'simucast-test-ubuntu', cloud: 'kubernetes',
108+
volumes: [
109+
persistentVolumeClaim(claimName: 'js-ubuntu-package', mountPath: '/root/ubuntu_package', readOnly: false),
110+
persistentVolumeClaim(claimName: 'ubuntu-audio-lib', mountPath: '/root/audio_lib',readOnly: false),
111+
persistentVolumeClaim(claimName: 'ubuntu-recording-lib', mountPath: '/root/recording_lib',readOnly: false),
112+
persistentVolumeClaim(claimName: 'ubuntu-sip-lib', mountPath: '/root/sip_lib',readOnly: false),
113+
persistentVolumeClaim(claimName: 'ubuntu-streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
114+
persistentVolumeClaim(claimName: 'ubuntu-video-lib', mountPath: '/root/video_lib',readOnly: false),
115+
persistentVolumeClaim(claimName: 'js-ubuntu-log', mountPath: '/root/ubuntu_log', readOnly: false)
116+
],
117+
containers: [
118+
containerTemplate(name: 'simucast-test-ubuntu', image: "$env.ubuntu_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '2000m', resourceLimitCpu: '6000m',resourceLimitMemory: '9.0Gi', resourceRequestMemory: '8.0Gi', network: 'host', command: 'cat'),
119+
]) {
120+
node('simucast-test-ubuntu') {
121+
container('simucast-test-ubuntu') {
122+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_API_3"
100123
}
101124
}
102125
}

0 commit comments

Comments
 (0)