ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KURENTO_MEDIA_SERVER_VERSION to KURENTO_MEDIA_SERVER_IMAGE

pull/707/head
pabloFuente 2022-03-21 11:39:10 +01:00
parent 3d3f7c1d74
commit 592cec9d10
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvidu-test-e2e/jenkins/Jenkinsfile vendored
View File

@ -120,7 +120,7 @@ node('container') {
try { try {
stage ('OpenVidu Kurento E2E tests') { stage ('OpenVidu Kurento E2E tests') {
try { try {
openViduE2ETest("kurento/kurento-media-server:${KURENTO_MEDIA_SERVER_VERSION}") openViduE2ETest("${KURENTO_MEDIA_SERVER_IMAGE}")
} catch (err) { } catch (err) {
// In case of error, fail the stage // In case of error, fail the stage
sh 'exit 1' sh 'exit 1'
@ -168,7 +168,7 @@ def environmentLaunch(mediaServer) {
sh 'cd /opt/openvidu/testapp && http-server -S -p 4200 &> /opt/openvidu/testapp.log &' sh 'cd /opt/openvidu/testapp && http-server -S -p 4200 &> /opt/openvidu/testapp.log &'
if (mediaServer == 'kurento') { if (mediaServer == 'kurento') {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
docker run -e KMS_UID=$(id -u) --network=host --detach=true --volume=/opt/openvidu/recordings:/opt/openvidu/recordings kurento/kurento-media-server:${KURENTO_MEDIA_SERVER_VERSION} docker run -e KMS_UID=$(id -u) --network=host --detach=true --volume=/opt/openvidu/recordings:/opt/openvidu/recordings ${KURENTO_MEDIA_SERVER_IMAGE}
'''.stripIndent()) '''.stripIndent())
} else if (mediaServer == 'mediasoup') { } else if (mediaServer == 'mediasoup') {
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
@ -206,7 +206,7 @@ def environmentStop() {
// Kill media server // Kill media server
sh(script: '''#!/bin/bash -xe sh(script: '''#!/bin/bash -xe
declare -a arr=("openvidu/mediasoup-controller:" declare -a arr=("openvidu/mediasoup-controller:"
"kurento/kurento-media-server:") "kurento/kurento-media-server")
for image in "${arr[@]}" for image in "${arr[@]}"
do do
docker ps -a | awk '{ print $1,$2 }' | grep "${image}" | awk '{ print $1 }' | xargs -I {} docker rm -f {} docker ps -a | awk '{ print $1,$2 }' | grep "${image}" | awk '{ print $1 }' | xargs -I {} docker rm -f {}

6
openvidu-test-e2e/jenkins/commonFunctions.groovy
View File

@ -78,8 +78,8 @@ def prepareTestingEnvironment() {
} }
}, },
'Pull kurento/kurento-media-server': { 'Pull kurento/kurento-media-server': {
if (env.KURENTO_MEDIA_SERVER_VERSION) { if (env.KURENTO_MEDIA_SERVER_IMAGE) {
docker.image("kurento/kurento-media-server:${KURENTO_MEDIA_SERVER_VERSION}").pull() docker.image("${KURENTO_MEDIA_SERVER_IMAGE}").pull()
} }
}, },
'Download fake video': { 'Download fake video': {
@ -131,7 +131,7 @@ def removeStrandedContainers(removeTestingContainers) {
"docker.elastic.co/beats/metricbeat-oss:" "docker.elastic.co/beats/metricbeat-oss:"
"docker.elastic.co/beats/filebeat-oss:" "docker.elastic.co/beats/filebeat-oss:"
"openvidu/openvidu-pro-dind-media-node:" "openvidu/openvidu-pro-dind-media-node:"
"kurento/kurento-media-server:" "kurento/kurento-media-server"
"openvidu/media-node-controller:") "openvidu/media-node-controller:")
if [ "${removeTestingContainers}" == "true" ]; then if [ "${removeTestingContainers}" == "true" ]; then
arr+=("openvidu/openvidu-test-e2e:") arr+=("openvidu/openvidu-test-e2e:")