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

Commit a30adef

Browse files
GaoMingKaiGaoMingKai
authored
add simucast stage (#328)
* add simucast stage * fix pipeline cpu config * fix config cpu
1 parent 3473561 commit a30adef

File tree

2 files changed

+50
-4
lines changed

2 files changed

+50
-4
lines changed

‎test/conference.jenkinsfile‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pipeline {
6666
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
6767
],
6868
containers: [
69-
containerTemplate(name: 'api-test', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
69+
containerTemplate(name: 'api-test', 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'),
7070
]) {
7171

7272
node('api-test') {
@@ -91,7 +91,7 @@ pipeline {
9191
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
9292
],
9393
containers: [
94-
containerTemplate(name: 'subscribe-test', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
94+
containerTemplate(name: 'subscribe-test', 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'),
9595
]) {
9696

9797
node('subscribe-test') {
@@ -102,6 +102,29 @@ pipeline {
102102
}
103103
}
104104
}
105+
stage('Simucast test') {
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_simulcast"
123+
}
124+
}
125+
}
126+
}
127+
}
105128
}
106129
}
107130
}

‎test/ubuntuconference.jenkinsfile‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pipeline {
6666
persistentVolumeClaim(claimName: 'js-ubuntu-log', mountPath: '/root/ubuntu_log', readOnly: false)
6767
],
6868
containers: [
69-
containerTemplate(name: 'api-test-ubuntu', image: "$env.ubuntu_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
69+
containerTemplate(name: 'api-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'),
7070
]) {
7171

7272
node('api-test-ubuntu') {
@@ -91,7 +91,7 @@ pipeline {
9191
persistentVolumeClaim(claimName: 'js-ubuntu-log', mountPath: '/root/ubuntu_log', readOnly: false)
9292
],
9393
containers: [
94-
containerTemplate(name: 'subscribe-test-ubuntu', image: "$env.ubuntu_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
94+
containerTemplate(name: 'subscribe-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'),
9595
]) {
9696

9797
node('subscribe-test-ubuntu') {
@@ -102,6 +102,29 @@ pipeline {
102102
}
103103
}
104104
}
105+
stage('Simucast test') {
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_simulcast"
123+
}
124+
}
125+
}
126+
}
127+
}
105128
}
106129
}
107130
}

0 commit comments

Comments
 (0)