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

Commit 1e1834c

Browse files
cisco66666cisco66666
authored
updatejenkinsfile (#403)
1 parent a9ec987 commit 1e1834c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎test/conference.jenkinsfile‎

Lines changed: 4 additions & 4 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_IMAGE42X", 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.JSMCU_TEST_IMAGE42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', command: 'cat')
2424
]) {
2525
node('unit-test') {
2626
container('unit-test') {
@@ -34,7 +34,7 @@ pipeline {
3434
options { timeout(time: 30, unit: 'MINUTES') }
3535
steps {
3636
podTemplate(name: 'pack', label: 'pack-mcu', containers: [
37-
containerTemplate(name: 'pack-on-centos', image: "$env.JS_MCU_BUILD42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
37+
containerTemplate(name: 'pack-on-centos', image: "$env.JS_MCU_BUILD42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', command: 'cat')
3838
]){
3939
node('pack-mcu') {
4040
container('pack-on-centos') {
@@ -51,7 +51,7 @@ pipeline {
5151
stage('API test') {
5252
steps {
5353
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes', containers: [
54-
containerTemplate(name: 'api-test', image: "$env.JSMCU_TEST_IMAGE42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
54+
containerTemplate(name: 'api-test', image: "$env.JSMCU_TEST_IMAGE42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', command: 'cat'),
5555
]) {
5656

5757
node('api-test') {
@@ -66,7 +66,7 @@ pipeline {
6666
stage('Subscribe test') {
6767
steps {
6868
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes', containers: [
69-
containerTemplate(name: 'subscribe-test', image: "$env.JSMCU_TEST_IMAGE42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
69+
containerTemplate(name: 'subscribe-test', image: "$env.JSMCU_TEST_IMAGE42X", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', command: 'cat'),
7070
]) {
7171

7272
node('subscribe-test') {

‎test/p2p.jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
withEnv(['JENKINS_NODE_COOKIE=dontkill']) {
2828
sh "python ${env.startServerScript} --p2p-server-path ${env.p2pServerPath} \
2929
--owner open-webrtc-toolkit --repo owt-client-javascript --commit-id ${GIT_COMMIT} \
30-
--github-script ${env.serverGithubScriptPath} --mode p2p"
30+
--git-branch ${GIT_BRANCH} --github-script ${env.serverGithubScriptPath} --mode p2p --workspace ${WORKSPACE}"
3131
}
3232
}
3333
}
@@ -43,7 +43,7 @@ pipeline {
4343
steps {
4444
sh "python ${env.jsCiScriptPath}/runTest.py --mode ci --source-path ${env.jsSourcePath} \
4545
--browsers chrome --mode ci --owner open-webrtc-toolkit --repo owt-client-javascript \
46-
--commit-id ${GIT_COMMIT} --github-script ${env.jsP2PTestGithubScriptPath}"
46+
--git-branch ${GIT_BRANCH} --github-script ${env.jsP2PTestGithubScriptPath}"
4747
}
4848
}
4949
}

‎test/ubuntuconference.jenkinsfile‎

Lines changed: 4 additions & 4 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_UBUNTU42x", 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.JSMCU_TEST_IMAGE_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '500m', resourceLimitCpu: '1000m', resourceLimitMemory: '1.0Gi', resourceRequestMemory: '0.5Gi', command: 'cat')
2424
]) {
2525
node('unit-test-ubuntu') {
2626
container('unit-test-ubuntu') {
@@ -34,7 +34,7 @@ pipeline {
3434
options { timeout(time: 30, unit: 'MINUTES') }
3535
steps {
3636
podTemplate(name: 'pack-ubuntu', label: 'pack-mcu-ubuntu', containers: [
37-
containerTemplate(name: 'pack-on-ubuntu', image: "$env.JS_MCU_BUILD_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', network: 'host', command: 'cat')
37+
containerTemplate(name: 'pack-on-ubuntu', image: "$env.JS_MCU_BUILD_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '1000m', resourceLimitCpu: '1500m', resourceLimitMemory: '1.5Gi', resourceRequestMemory: '1.0Gi', command: 'cat')
3838
]){
3939
node('pack-mcu-ubuntu') {
4040
container('pack-on-ubuntu') {
@@ -51,7 +51,7 @@ pipeline {
5151
stage('API test') {
5252
steps {
5353
podTemplate(name: 'api-test-ubuntu', label: 'api-test-ubuntu', cloud: 'kubernetes', containers: [
54-
containerTemplate(name: 'api-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
54+
containerTemplate(name: 'api-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', command: 'cat'),
5555
]) {
5656

5757
node('api-test-ubuntu') {
@@ -66,7 +66,7 @@ pipeline {
6666
stage('Subscribe test') {
6767
steps {
6868
podTemplate(name: 'subscribe-test-ubuntu', label: 'subscribe-test-ubuntu', cloud: 'kubernetes', containers: [
69-
containerTemplate(name: 'subscribe-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', network: 'host', command: 'cat'),
69+
containerTemplate(name: 'subscribe-test-ubuntu', image: "$env.JSMCU_TEST_IMAGE_UBUNTU42x", ttyEnabled: true, alwaysPullImage: true, privileged: true, resourceRequestCpu: '8000m', resourceLimitCpu: '9000m', resourceLimitMemory: '10.0Gi', resourceRequestMemory: '9.0Gi', command: 'cat'),
7070
]) {
7171

7272
node('subscribe-test-ubuntu') {

0 commit comments

Comments
 (0)