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

Commit fd0f1e2

Browse files
cisco66666peng
cisco66666
and
peng
authored
Update JS master jenkins file (#356)
Co-authored-by: peng <[email protected]>
1 parent 536eb6e commit fd0f1e2

File tree

2 files changed

+49
-106
lines changed

2 files changed

+49
-106
lines changed

‎test/conference.jenkinsfile

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ pipeline {
1919
stages {
2020
stage('Unit test') {
2121
steps {
22-
podTemplate(name: 'unit-test', label: 'unit-test', cloud: 'kubernetes', containers: [
23-
containerTemplate(name: 'unit-test', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', network: 'host', command: 'cat')
22+
podTemplate(name: 'unit-js-centos-'+env.GIT_BRANCH, label: 'unit-js-centos-'+env.GIT_BRANCH, cloud: 'kubernetes', containers: [
23+
containerTemplate(name: 'test-images', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '2000m', resourceRequestMemory: '1.0Gi', resourceLimitMemory: '2.0Gi',command: 'cat')
2424
]) {
25-
node('unit-test') {
26-
container('unit-test') {
25+
node('unit-js-centos-'+env.GIT_BRANCH) {
26+
container('test-images') {
2727
sh "cd /root/owt-client-javascript/test/unit/karma-test/ && ./start.sh $env.GIT_BRANCH $env.CHANGE_ID"
2828
}
2929
}
@@ -33,17 +33,18 @@ pipeline {
3333
stage('Build package') {
3434
options { timeout(time: 20, unit: 'MINUTES') }
3535
steps {
36-
podTemplate(name: 'pack', label: 'pack-mcu',
36+
podTemplate(name: 'pack-js-centos-'+env.GIT_BRANCH, label: 'pack-js-centos-'+env.GIT_BRANCH,
3737
volumes: [
3838
persistentVolumeClaim(claimName: 'stability-package',mountPath: '/root/stabilityPackage',readOnly: false),
39-
persistentVolumeClaim(claimName: 'js-centos-package',mountPath: '/root/centos_package',readOnly: false)
39+
persistentVolumeClaim(claimName: 'js-centos-package',mountPath: '/root/centos_package',readOnly: false),
40+
persistentVolumeClaim(claimName: 'webrtc79',mountPath: '/root/owt-server/third_party/webrtc-m79',readOnly: false)
4041
],
4142
containers: [
42-
containerTemplate(name: 'pack-on-centos', image: "$env.centos_build_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
43+
containerTemplate(name: 'build-images', image: "$env.centos_build_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '5000m', resourceLimitCpu: '6000m' , command: 'cat')
4344
]){
44-
node('pack-mcu') {
45-
container('pack-on-centos') {
46-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos build javascript $env.GIT_BRANCH $env.GIT_COMMIT $env.CHANGE_ID"
45+
node('pack-js-centos-'+env.GIT_BRANCH) {
46+
container('build-images') {
47+
sh "/root/startRun.sh * * centos build javascript $env.GIT_BRANCH $env.GIT_COMMIT $env.CHANGE_ID"
4748
}
4849
}
4950
}
@@ -55,23 +56,18 @@ pipeline {
5556
parallel {
5657
stage('ConferenceClient API 1') {
5758
steps {
58-
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes',
59+
podTemplate(name: 'api-js-centos-'+env.GIT_BRANCH, label: 'api-js-centos-'+env.GIT_BRANCH, cloud: 'kubernetes',
5960
volumes: [
6061
persistentVolumeClaim(claimName: 'js-centos-package', mountPath: '/root/centos_package', readOnly: false),
61-
persistentVolumeClaim(claimName: 'audio-lib', mountPath: '/root/audio_lib',readOnly: false),
62-
persistentVolumeClaim(claimName: 'recording-lib', mountPath: '/root/recording_lib',readOnly: false),
63-
persistentVolumeClaim(claimName: 'sip-lib', mountPath: '/root/sip_lib',readOnly: false),
64-
persistentVolumeClaim(claimName: 'streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
65-
persistentVolumeClaim(claimName: 'video-lib', mountPath: '/root/video_lib',readOnly: false),
6662
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
6763
],
6864
containers: [
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'),
65+
containerTemplate(name: 'test-images', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', resourceRequestMemory: '2.0Gi', resourceLimitMemory: '3.0Gi', command: 'cat'),
7066
]) {
7167

72-
node('api-test') {
73-
container('api-test') {
74-
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_API_1"
68+
node('api-js-centos-'+env.GIT_BRANCH) {
69+
container('test-images') {
70+
sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_1"
7571
}
7672
}
7773
}
@@ -80,46 +76,18 @@ pipeline {
8076

8177
stage('ConferenceClient API 2') {
8278
steps {
83-
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes',
79+
podTemplate(name: 'rest-js-centos-'+env.GIT_BRANCH, label: 'rest-js-centos-'+env.GIT_BRANCH, cloud: 'kubernetes',
8480
volumes: [
8581
persistentVolumeClaim(claimName: 'js-centos-package', mountPath: '/root/centos_package', readOnly: false),
86-
persistentVolumeClaim(claimName: 'audio-lib', mountPath: '/root/audio_lib',readOnly: false),
87-
persistentVolumeClaim(claimName: 'recording-lib', mountPath: '/root/recording_lib',readOnly: false),
88-
persistentVolumeClaim(claimName: 'sip-lib', mountPath: '/root/sip_lib',readOnly: false),
89-
persistentVolumeClaim(claimName: 'streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
90-
persistentVolumeClaim(claimName: 'video-lib', mountPath: '/root/video_lib',readOnly: false),
9182
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
9283
],
9384
containers: [
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'),
85+
containerTemplate(name: 'test-images', image: "$env.centos_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '3000m', resourceLimitCpu: '4000m', resourceRequestMemory: '2.0Gi', resourceLimitMemory: '3.0Gi', command: 'cat'),
9586
]) {
9687

97-
node('subscribe-test') {
98-
container('subscribe-test') {
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"
88+
node('rest-js-centos-'+env.GIT_BRANCH) {
89+
container('test-images') {
90+
sh "/root/startRun.sh * * centos test ${env.GIT_COMMIT} ConferenceClient_API_2"
12391
}
12492
}
12593
}
@@ -143,3 +111,6 @@ pipeline {
143111
}
144112
}
145113
}
114+
115+
116+

0 commit comments

Comments
 (0)