From fd287c7d2c8b527545299b7cbe1949187fc7da05 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 8 Nov 2021 10:03:08 +0100 Subject: [PATCH] openvidu-test-e2e: update custom external layout from port 5555 to 4114 --- .../main/resources/aplication-pro-layout-handler.properties | 2 +- openvidu-test-e2e/jenkins/Jenkinsfile | 4 ++-- .../io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openvidu-test-browsers/src/main/resources/aplication-pro-layout-handler.properties b/openvidu-test-browsers/src/main/resources/aplication-pro-layout-handler.properties index 10fc87dd..09f8bb41 100644 --- a/openvidu-test-browsers/src/main/resources/aplication-pro-layout-handler.properties +++ b/openvidu-test-browsers/src/main/resources/aplication-pro-layout-handler.properties @@ -1,3 +1,3 @@ -server.port=5555 +server.port=4114 server.ssl.enabled=false security.basic.enabled=false \ No newline at end of file diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index 6961d732..c05a336e 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -16,7 +16,7 @@ node('container') { '-v /opt/openvidu-cache/.m2:/root/.m2'].join(' ') // Run openvidu/openvidu-test-e2e container - docker.image("openvidu/openvidu-test-e2e:${DISTRO}").inside('--privileged -p 4200:4200 -p 4443:4443 -p 5555:5555 -u root -e MY_UID=0 ' + "${bindsArray}") { + docker.image("openvidu/openvidu-test-e2e:${DISTRO}").inside('--privileged -p 4200:4200 -p 4443:4443 -p 4114:4114 -u root -e MY_UID=0 ' + "${bindsArray}") { stage('Build 1') { parallel 'OpenVidu Browser build': { stage('OpenVidu Browser build') { @@ -225,7 +225,7 @@ def openViduE2ETest(mediaServerImage) { env.edgeVersion = "${EDGE_VERSION}" sh(script: '''#!/bin/bash -xe cd openvidu/openvidu-test-e2e - ENV_VARS="-DMEDIA_SERVER_IMAGE=${mediaServerImage} -DCHROME_VERSION=${chromeVersion} -DFIREFOX_VERSION=${firefoxVersion} -DOPERA_VERSION=${operaVersion} -DEDGE_VERSION=${edgeVersion} -Dtest=OpenViduTestAppE2eTest -DAPP_URL=https://172.17.0.1:4200/ -DOPENVIDU_URL=https://172.17.0.1:4443/ -DREMOTE_URL_CHROME=http://172.17.0.1:6666/wd/hub/ -DREMOTE_URL_FIREFOX=http://172.17.0.1:6667/wd/hub/ -DREMOTE_URL_OPERA=http://172.17.0.1:6668/wd/hub/ -DREMOTE_URL_EDGE=http://172.17.0.1:6669/wd/hub/ -DEXTERNAL_CUSTOM_LAYOUT_URL=http://172.17.0.1:5555 -DEXTERNAL_CUSTOM_LAYOUT_PARAMS=sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" + ENV_VARS="-DMEDIA_SERVER_IMAGE=${mediaServerImage} -DCHROME_VERSION=${chromeVersion} -DFIREFOX_VERSION=${firefoxVersion} -DOPERA_VERSION=${operaVersion} -DEDGE_VERSION=${edgeVersion} -Dtest=OpenViduTestAppE2eTest -DAPP_URL=https://172.17.0.1:4200/ -DOPENVIDU_URL=https://172.17.0.1:4443/ -DREMOTE_URL_CHROME=http://172.17.0.1:6666/wd/hub/ -DREMOTE_URL_FIREFOX=http://172.17.0.1:6667/wd/hub/ -DREMOTE_URL_OPERA=http://172.17.0.1:6668/wd/hub/ -DREMOTE_URL_EDGE=http://172.17.0.1:6669/wd/hub/ -DEXTERNAL_CUSTOM_LAYOUT_URL=http://172.17.0.1:4114 -DEXTERNAL_CUSTOM_LAYOUT_PARAMS=sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET" if [[ $mediaServerImage == *"openvidu/mediasoup-controller"* ]]; then ENV_VARS+=" -DOPENVIDU_PRO_LICENSE=${openviduProLicense} -DOPENVIDU_PRO_LICENSE_API=${openviduProLicenseApi}" fi diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java index 80fe1e67..ea649f05 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java @@ -93,7 +93,7 @@ public class AbstractOpenViduTestAppE2eTest { protected static String OPENVIDU_SECRET = "MY_SECRET"; protected static String OPENVIDU_URL = "https://localhost:4443/"; protected static String APP_URL = "http://localhost:4200/"; - protected static String EXTERNAL_CUSTOM_LAYOUT_URL = "http://localhost:5555"; + protected static String EXTERNAL_CUSTOM_LAYOUT_URL = "http://localhost:4114"; protected static String OPENVIDU_PRO_LICENSE = "not_valid"; protected static String OPENVIDU_PRO_LICENSE_API = "not_valid"; protected static String EXTERNAL_CUSTOM_LAYOUT_PARAMS = "sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET";