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

update 4.2.x and p2p jenkinsfile #403

Merged
jianjunz merged 1 commit into from
Sep 4, 2020
Merged

update 4.2.x and p2p jenkinsfile #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/conference.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pipeline {
stage('Unit test') {
steps {
podTemplate(name: 'unit-test', label: 'unit-test', cloud: 'kubernetes', containers: [
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')
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')
]) {
node('unit-test') {
container('unit-test') {
Expand All @@ -34,7 +34,7 @@ pipeline {
options { timeout(time: 30, unit: 'MINUTES') }
steps {
podTemplate(name: 'pack', label: 'pack-mcu', containers: [
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')
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')
]){
node('pack-mcu') {
container('pack-on-centos') {
Expand All @@ -51,7 +51,7 @@ pipeline {
stage('API test') {
steps {
podTemplate(name: 'api-test', label: 'api-test', cloud: 'kubernetes', containers: [
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'),
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'),
]) {

node('api-test') {
Expand All @@ -66,7 +66,7 @@ pipeline {
stage('Subscribe test') {
steps {
podTemplate(name: 'subscribe-test', label: 'subscribe-test', cloud: 'kubernetes', containers: [
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'),
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'),
]) {

node('subscribe-test') {
Expand Down
4 changes: 2 additions & 2 deletions test/p2p.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
withEnv(['JENKINS_NODE_COOKIE=dontkill']) {
sh "python ${env.startServerScript} --p2p-server-path ${env.p2pServerPath} \
--owner open-webrtc-toolkit --repo owt-client-javascript --commit-id ${GIT_COMMIT} \
--github-script ${env.serverGithubScriptPath} --mode p2p"
--git-branch ${GIT_BRANCH} --github-script ${env.serverGithubScriptPath} --mode p2p --workspace ${WORKSPACE}"
}
}
}
Expand All @@ -43,7 +43,7 @@ pipeline {
steps {
sh "python ${env.jsCiScriptPath}/runTest.py --mode ci --source-path ${env.jsSourcePath} \
--browsers chrome --mode ci --owner open-webrtc-toolkit --repo owt-client-javascript \
--commit-id ${GIT_COMMIT} --github-script ${env.jsP2PTestGithubScriptPath}"
--git-branch ${GIT_BRANCH} --github-script ${env.jsP2PTestGithubScriptPath}"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions test/ubuntuconference.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pipeline {
stage('Unit test') {
steps {
podTemplate(name: 'unit-test-ubuntu', label: 'unit-test-ubuntu', cloud: 'kubernetes', containers: [
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')
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')
]) {
node('unit-test-ubuntu') {
container('unit-test-ubuntu') {
Expand All @@ -34,7 +34,7 @@ pipeline {
options { timeout(time: 30, unit: 'MINUTES') }
steps {
podTemplate(name: 'pack-ubuntu', label: 'pack-mcu-ubuntu', containers: [
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')
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')
]){
node('pack-mcu-ubuntu') {
container('pack-on-ubuntu') {
Expand All @@ -51,7 +51,7 @@ pipeline {
stage('API test') {
steps {
podTemplate(name: 'api-test-ubuntu', label: 'api-test-ubuntu', cloud: 'kubernetes', containers: [
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'),
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'),
]) {

node('api-test-ubuntu') {
Expand All @@ -66,7 +66,7 @@ pipeline {
stage('Subscribe test') {
steps {
podTemplate(name: 'subscribe-test-ubuntu', label: 'subscribe-test-ubuntu', cloud: 'kubernetes', containers: [
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'),
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'),
]) {

node('subscribe-test-ubuntu') {
Expand Down