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

Commit d727af2

Browse files
GaoMingKaiyanbin7
GaoMingKai
authored and
yanbin7
committed
fix pipeline for pv (#325)
1 parent f8403a4 commit d727af2

File tree

2 files changed

+70
-20
lines changed

2 files changed

+70
-20
lines changed

‎test/conference.jenkinsfile‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipeline {
2020
stage('Unit test') {
2121
steps {
2222
podTemplate(name: 'unit-test', label: 'unit-test', cloud: 'kubernetes', containers: [
23-
containerTemplate(name: 'unit-test', image: "$env.JSMCU_TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', network: 'host', command: 'cat')
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')
2424
]) {
2525
node('unit-test') {
2626
container('unit-test') {
@@ -33,12 +33,17 @@ pipeline {
3333
stage('Build package') {
3434
options { timeout(time: 20, unit: 'MINUTES') }
3535
steps {
36-
podTemplate(name: 'pack', label: 'pack-mcu', containers: [
37-
containerTemplate(name: 'pack-on-centos', image: "$env.JS_MCU_BUILD", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
36+
podTemplate(name: 'pack', label: 'pack-mcu',
37+
volumes: [
38+
persistentVolumeClaim(claimName: 'stability-package',mountPath: '/root/stabilityPackage',readOnly: false),
39+
persistentVolumeClaim(claimName: 'js-centos-package',mountPath: '/root/centos_package',readOnly: false)
40+
],
41+
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')
3843
]){
3944
node('pack-mcu') {
4045
container('pack-on-centos') {
41-
sh "/root/packSDKInDocker.sh $env.GIT_COMMIT $env.GIT_BRANCH $env.CHANGE_ID"
46+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos build javascript $env.GIT_BRANCH $env.GIT_COMMIT $env.CHANGE_ID"
4247
}
4348
}
4449
}
@@ -50,13 +55,23 @@ pipeline {
5055
parallel {
5156
stage('API test') {
5257
steps {
53-
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes', containers: [
54-
containerTemplate(name: 'api-test', image: "$env.JSMCU_TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
58+
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes',
59+
volumes: [
60+
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),
66+
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
67+
],
68+
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'),
5570
]) {
5671

5772
node('api-test') {
5873
container('api-test') {
59-
sh "/root/start.sh ${env.GIT_COMMIT}1 ConferenceClient_api"
74+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_api"
6075
}
6176
}
6277
}
@@ -65,13 +80,23 @@ pipeline {
6580

6681
stage('Subscribe test') {
6782
steps {
68-
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes', containers: [
69-
containerTemplate(name: 'subscribe-test', image: "$env.JSMCU_TEST_IMAGE", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
83+
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes',
84+
volumes: [
85+
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),
91+
persistentVolumeClaim(claimName: 'js-centos-log', mountPath: '/root/centos_log', readOnly: false)
92+
],
93+
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'),
7095
]) {
7196

7297
node('subscribe-test') {
7398
container('subscribe-test') {
74-
sh "/root/start.sh ${env.GIT_COMMIT}2 ConferenceClient_subscribe"
99+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password centos test ${env.GIT_COMMIT} ConferenceClient_subscribe"
75100
}
76101
}
77102
}

‎test/ubuntuconference.jenkinsfile‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipeline {
2020
stage('Unit test') {
2121
steps {
2222
podTemplate(name: 'unit-test-ubuntu', label: 'unit-test-ubuntu', cloud: 'kubernetes', containers: [
23-
containerTemplate(name: 'unit-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', network: 'host', command: 'cat')
23+
containerTemplate(name: 'unit-test-ubuntu', image: "$env.ubuntu_test_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', network: 'host', command: 'cat')
2424
]) {
2525
node('unit-test-ubuntu') {
2626
container('unit-test-ubuntu') {
@@ -33,12 +33,17 @@ pipeline {
3333
stage('Build package') {
3434
options { timeout(time: 20, unit: 'MINUTES') }
3535
steps {
36-
podTemplate(name: 'pack-ubuntu', label: 'pack-mcu-ubuntu', containers: [
37-
containerTemplate(name: 'pack-on-ubuntu', image: "$env.JS_MCU_BUILD_UBUNTU", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
36+
podTemplate(name: 'pack-ubuntu', label: 'pack-mcu-ubuntu',
37+
volumes: [
38+
persistentVolumeClaim(claimName: 'stability-package',mountPath: '/root/stabilityPackage',readOnly: false),
39+
persistentVolumeClaim(claimName: 'js-ubuntu-package',mountPath: '/root/ubuntu_package',readOnly: false)
40+
],
41+
containers: [
42+
containerTemplate(name: 'pack-on-ubuntu', image: "$env.ubuntu_build_images", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
3843
]){
3944
node('pack-mcu-ubuntu') {
4045
container('pack-on-ubuntu') {
41-
sh "/root/packSDKInDocker.sh $env.GIT_COMMIT $env.GIT_BRANCH $env.CHANGE_ID"
46+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu build javascript $env.GIT_BRANCH $env.GIT_COMMIT $env.CHANGE_ID"
4247
}
4348
}
4449
}
@@ -50,13 +55,23 @@ pipeline {
5055
parallel {
5156
stage('API test') {
5257
steps {
53-
podTemplate(name: 'api-test-ubuntu', label: 'api-test-ubuntu', cloud: 'kubernetes', containers: [
54-
containerTemplate(name: 'api-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
58+
podTemplate(name: 'api-test-ubuntu', label: 'api-test-ubuntu', cloud: 'kubernetes',
59+
volumes: [
60+
persistentVolumeClaim(claimName: 'js-ubuntu-package', mountPath: '/root/ubuntu_package', readOnly: false),
61+
persistentVolumeClaim(claimName: 'ubuntu-audio-lib', mountPath: '/root/audio_lib',readOnly: false),
62+
persistentVolumeClaim(claimName: 'ubuntu-recording-lib', mountPath: '/root/recording_lib',readOnly: false),
63+
persistentVolumeClaim(claimName: 'ubuntu-sip-lib', mountPath: '/root/sip_lib',readOnly: false),
64+
persistentVolumeClaim(claimName: 'ubuntu-streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
65+
persistentVolumeClaim(claimName: 'ubuntu-video-lib', mountPath: '/root/video_lib',readOnly: false),
66+
persistentVolumeClaim(claimName: 'js-ubuntu-log', mountPath: '/root/ubuntu_log', readOnly: false)
67+
],
68+
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'),
5570
]) {
5671

5772
node('api-test-ubuntu') {
5873
container('api-test-ubuntu') {
59-
sh "/root/start.sh ${env.GIT_COMMIT}1 ConferenceClient_api"
74+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_api"
6075
}
6176
}
6277
}
@@ -65,13 +80,23 @@ pipeline {
6580

6681
stage('Subscribe test') {
6782
steps {
68-
podTemplate(name: 'subscribe-test-ubuntu', label: 'subscribe-test-ubuntu', cloud: 'kubernetes', containers: [
69-
containerTemplate(name: 'subscribe-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
83+
podTemplate(name: 'subscribe-test-ubuntu', label: 'subscribe-test-ubuntu', cloud: 'kubernetes',
84+
volumes: [
85+
persistentVolumeClaim(claimName: 'js-ubuntu-package', mountPath: '/root/ubuntu_package', readOnly: false),
86+
persistentVolumeClaim(claimName: 'ubuntu-audio-lib', mountPath: '/root/audio_lib',readOnly: false),
87+
persistentVolumeClaim(claimName: 'ubuntu-recording-lib', mountPath: '/root/recording_lib',readOnly: false),
88+
persistentVolumeClaim(claimName: 'ubuntu-sip-lib', mountPath: '/root/sip_lib',readOnly: false),
89+
persistentVolumeClaim(claimName: 'ubuntu-streaming-lib', mountPath: '/root/streaming_lib', readOnly: false),
90+
persistentVolumeClaim(claimName: 'ubuntu-video-lib', mountPath: '/root/video_lib',readOnly: false),
91+
persistentVolumeClaim(claimName: 'js-ubuntu-log', mountPath: '/root/ubuntu_log', readOnly: false)
92+
],
93+
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'),
7095
]) {
7196

7297
node('subscribe-test-ubuntu') {
7398
container('subscribe-test-ubuntu') {
74-
sh "/root/start.sh ${env.GIT_COMMIT}2 ConferenceClient_subscribe"
99+
sh "/root/startRun.sh $env.gitlab_username $env.gitlab_password ubuntu test ${env.GIT_COMMIT} ConferenceClient_subscribe"
75100
}
76101
}
77102
}

0 commit comments

Comments
 (0)