diff --git a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template index 926fc9e2..72ce5a20 100644 --- a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template +++ b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template @@ -88,14 +88,14 @@ Resources: IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml + sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.yml done # docker-compose.override.yml replace with master version IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml + sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.override.yml done popd diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh index 24124a36..cf68c179 100755 --- a/openvidu-server/deployments/ce/aws/createAMI.sh +++ b/openvidu-server/deployments/ce/aws/createAMI.sh @@ -54,7 +54,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ce-am if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_VERSION} != "master-v2" ]]; then INSTALL_SCRIPT_EXISTS=true aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_$OPENVIDU_VERSION.sh || INSTALL_SCRIPT_EXISTS=false if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then @@ -112,7 +112,7 @@ sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" CF-OpenVidu-${OPENVIDU_VERSION if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_VERSION} != "master-v2" ]]; then CF_EXIST=true aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-${OPENVIDU_VERSION}.yaml || CF_EXIST=false if [[ ${CF_EXIST} == "true" ]]; then diff --git a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh index e9e092c6..7f37c014 100755 --- a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh +++ b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh @@ -2,7 +2,7 @@ # Global variables OPENVIDU_FOLDER=openvidu -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} diff --git a/openvidu-server/deployments/enterprise-ha/docker-compose/base-services/install_ov_enterprise_ha_base.sh b/openvidu-server/deployments/enterprise-ha/docker-compose/base-services/install_ov_enterprise_ha_base.sh index 3b06dd4b..c829ac25 100644 --- a/openvidu-server/deployments/enterprise-ha/docker-compose/base-services/install_ov_enterprise_ha_base.sh +++ b/openvidu-server/deployments/enterprise-ha/docker-compose/base-services/install_ov_enterprise_ha_base.sh @@ -3,7 +3,7 @@ # Global variables OPENVIDU_FOLDER=ov-enterprise-base-services ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} @@ -321,4 +321,4 @@ if [[ -n "$1" && "$1" == "upgrade" ]]; then upgrade_ov "$2" else new_ov_installation -fi \ No newline at end of file +fi diff --git a/openvidu-server/deployments/enterprise-ha/docker-compose/node/install_openvidu_enterprise_ha_node.sh b/openvidu-server/deployments/enterprise-ha/docker-compose/node/install_openvidu_enterprise_ha_node.sh index 5eb5a6e5..dda32d76 100755 --- a/openvidu-server/deployments/enterprise-ha/docker-compose/node/install_openvidu_enterprise_ha_node.sh +++ b/openvidu-server/deployments/enterprise-ha/docker-compose/node/install_openvidu_enterprise_ha_node.sh @@ -2,7 +2,7 @@ # Global variables OPENVIDU_FOLDER=openvidu -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" BEATS_FOLDER=${OPENVIDU_FOLDER}/beats DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} diff --git a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template index bded704c..6779f47f 100644 --- a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template @@ -89,7 +89,7 @@ Resources: IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.yml + sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.yml done # docker-compose.override.yml replace with master version @@ -97,7 +97,7 @@ Resources: IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.override.yml + sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.override.yml done fi diff --git a/openvidu-server/deployments/enterprise/aws/createAMI.sh b/openvidu-server/deployments/enterprise/aws/createAMI.sh index dfbbc330..aa51a640 100755 --- a/openvidu-server/deployments/enterprise/aws/createAMI.sh +++ b/openvidu-server/deployments/enterprise/aws/createAMI.sh @@ -56,7 +56,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-crete-ov-aws if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then INSTALL_SCRIPT_EXISTS=true aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_enterprise_master_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then @@ -121,7 +121,7 @@ sed -i "s/KMS_AMI_ID/${KMS_AMI_ID}/g" CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERS if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then CF_EXIST=true aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false if [[ ${CF_EXIST} == "true" ]]; then diff --git a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template index c038ef89..a70969e4 100644 --- a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template @@ -80,7 +80,7 @@ Resources: # Install openvidu-pro cd /opt - if [[ "OPENVIDU_VERSION" == "master" ]]; then + if [[ "OPENVIDU_VERSION" == "master-v2" ]]; then curl https://raw.githubusercontent.com/OpenVidu/openvidu/v2/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash else curl https://raw.githubusercontent.com/OpenVidu/openvidu/vOPENVIDU_VERSION/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash @@ -93,7 +93,7 @@ Resources: IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.yml + sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.yml done # docker-compose.override.yml replace with master version @@ -101,7 +101,7 @@ Resources: IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.override.yml + sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.override.yml done fi diff --git a/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh b/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh index 1d198ecd..ad840f50 100755 --- a/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh +++ b/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh @@ -2,7 +2,7 @@ # Global variables OPENVIDU_FOLDER=openvidu -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch diff --git a/openvidu-server/deployments/external-turn/docker-compose/install_openvidu_external_coturn.sh b/openvidu-server/deployments/external-turn/docker-compose/install_openvidu_external_coturn.sh index 437a88e2..02b21f0b 100755 --- a/openvidu-server/deployments/external-turn/docker-compose/install_openvidu_external_coturn.sh +++ b/openvidu-server/deployments/external-turn/docker-compose/install_openvidu_external_coturn.sh @@ -2,8 +2,8 @@ COTURN_FOLDER="coturn" CERTBOT_WRAPPER="${COTURN_FOLDER}/certbot-wrapper" -COTURN_VERSION=master -DOWNLOAD_URL="https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-server/deployments/external-turn/${COTURN_VERSION}" +COTURN_VERSION=v2 +DOWNLOAD_URL="https://raw.githubusercontent.com/OpenVidu/openvidu/v2/openvidu-server/deployments/external-turn/${COTURN_VERSION}" #COTURN_VERSION=4.6.2 #DOWNLOAD_URL="https://s3.eu-west-1.amazonaws.com/aws.openvidu.io/external-turn/${COTURN_VERSION}" diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template index b2600964..a502a76f 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template @@ -103,7 +103,7 @@ Resources: for IMAGE in "${IMAGES[@]}" do # Replace the image tag in the YAML file - sed -i "s,$IMAGE:.*,${IMAGE}:master,g" docker-compose.yml + sed -i "s,$IMAGE:.*,${IMAGE}:master-v2,g" docker-compose.yml done # Docker pull of the images diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template index 0de625ae..efe36636 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template @@ -90,14 +90,14 @@ Resources: IMAGES=$(echo "$IMAGES" | grep -v openvidu/openvidu-elasticsearch) for IMG in $IMAGES do - sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml + sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.yml done # docker-compose.override.yml replace with master version IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" for IMG in $IMAGES do - sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml + sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.override.yml done popd diff --git a/openvidu-server/deployments/pro/aws/createAMI.sh b/openvidu-server/deployments/pro/aws/createAMI.sh index fc893f79..76986430 100755 --- a/openvidu-server/deployments/pro/aws/createAMI.sh +++ b/openvidu-server/deployments/pro/aws/createAMI.sh @@ -72,7 +72,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-kms-ami. if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then INSTALL_SCRIPT_EXISTS=true aws s3api head-object --bucket aws.openvidu.io --key install_media_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then @@ -132,7 +132,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ami.y if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then INSTALL_SCRIPT_EXISTS=true aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_pro_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then @@ -191,7 +191,7 @@ sed -i "s/_AWS_CLI_DOCKER_TAG_/${AWS_CLI_DOCKER_TAG}/g" CF-OpenVidu-Pro-${OPENVI if [[ ${UPDATE_S3_FILES} == "true" ]]; then # Avoid overriding existing versions # Only master and non existing versions can be overriden - if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then + if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then CF_EXIST=true aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false if [[ ${CF_EXIST} == "true" ]]; then diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh index 83d47e00..0b0df7e6 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh +++ b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash MEDIA_NODE_FOLDER=kms -MEDIA_NODE_VERSION=master +MEDIA_NODE_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats OPENVIDU_RECORDINGS_FOLDER="/opt/openvidu/recordings" diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/install_openvidu_pro_mono_node.sh b/openvidu-server/deployments/pro/docker-compose/mono-node/install_openvidu_pro_mono_node.sh index 28aee988..f544b265 100755 --- a/openvidu-server/deployments/pro/docker-compose/mono-node/install_openvidu_pro_mono_node.sh +++ b/openvidu-server/deployments/pro/docker-compose/mono-node/install_openvidu_pro_mono_node.sh @@ -2,7 +2,7 @@ # Global variables OPENVIDU_FOLDER=openvidu -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch BEATS_FOLDER=${OPENVIDU_FOLDER}/beats diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh index 84b03908..e0785fac 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh @@ -2,7 +2,7 @@ # Global variables OPENVIDU_FOLDER=openvidu -OPENVIDU_VERSION=master +OPENVIDU_VERSION=v2 OPENVIDU_UPGRADABLE_VERSION="2.30" AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java index 3be65d3a..2e922414 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java @@ -1391,7 +1391,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1419,7 +1419,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1491,7 +1491,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1580,7 +1580,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1656,7 +1656,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1731,7 +1731,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1803,7 +1803,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1876,7 +1876,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -1949,7 +1949,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2010,7 +2010,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2082,7 +2082,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2146,7 +2146,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2232,7 +2232,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2283,7 +2283,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config); @@ -2333,7 +2333,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { config.put("OPENVIDU_PRO_NETWORK_QUALITY", false); config.put("OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT); config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); - config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-custom:master"); + config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-custom:master-v2"); if (DOCKERHUB_PRIVATE_REGISTRY_PASSWORD != null && !"not_valid".equals(DOCKERHUB_PRIVATE_REGISTRY_PASSWORD)) { config.put("OPENVIDU_PRO_DOCKER_REGISTRIES", "[\"serveraddress=docker.io,username=openvidu,password=" @@ -2393,7 +2393,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { // STT Vosk manual config = Map.of("OPENVIDU_PRO_SPEECH_TO_TEXT", "vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "manual"); restartOpenViduServer(config); @@ -2554,7 +2554,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { log.info("Load Unload Model Error STT"); Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", - "vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-service:master", + "vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "manual"); restartOpenViduServer(config); @@ -2701,7 +2701,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "manual", "OPENVIDU_PRO_CLUSTER_MEDIA_NODES", 3); restartOpenViduServer(config); @@ -3146,7 +3146,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { try { Map config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", - "openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", + "openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand"); restartOpenViduServer(config);