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

openvidu-test-e2e: fix docker run command to launch mediasoup-controller storing logs

pull/819/head
pabloFuente 2023-09-20 19:17:29 +02:00
parent 169df4373b
commit c24ad580de
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci-scripts/openvidu-e2e-tests.sh
View File

@ -49,7 +49,7 @@ function environmentLaunch {
fi fi
done done
elif [[ "${MEDIA_SERVER}" == "mediasoup" ]]; then elif [[ "${MEDIA_SERVER}" == "mediasoup" ]]; then
LOG_DATE=$(printf '%(%Y-%m-%d-%H:%M:%S)T') LOG_DATE=$(printf '%(%Y-%m-%d-%H-%M-%S)T')
docker run --network=host --restart=always \ docker run --network=host --restart=always \
--env=KMS_MIN_PORT=40000 \ --env=KMS_MIN_PORT=40000 \
--env=KMS_MAX_PORT=65535 \ --env=KMS_MAX_PORT=65535 \

9
openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/CommandLineExecutor.java
View File

@ -27,10 +27,17 @@ public class CommandLineExecutor {
* WARNING: does not work with subshell. i.e: echo $(VARIABLE) * WARNING: does not work with subshell. i.e: echo $(VARIABLE)
*/ */
public String executeCommand(String command, int secondsTimeout) { public String executeCommand(String command, int secondsTimeout) {
return this.executeCommand(command, false, secondsTimeout);
}
/**
* WARNING: does not work with subshell. i.e: echo $(VARIABLE)
*/
public String executeCommand(String command, boolean useBash, int secondsTimeout) {
String output = ""; String output = "";
Process p = null; Process p = null;
try { try {
p = Runtime.getRuntime().exec((new String[] { "/bin/sh", "-c", command })); p = Runtime.getRuntime().exec((new String[] { "/bin/" + (useBash ? "bash" : "sh"), "-c", command }));
if (!p.waitFor(secondsTimeout, TimeUnit.SECONDS)) { if (!p.waitFor(secondsTimeout, TimeUnit.SECONDS)) {
System.err.println("Command " + command + " did not completed in " + secondsTimeout + " seconds"); System.err.println("Command " + command + " did not completed in " + secondsTimeout + " seconds");
p.destroyForcibly(); p.destroyForcibly();

7
openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
View File

@ -638,16 +638,17 @@ public class OpenViduTestE2e {
+ " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE; + " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE;
} else if (MEDIA_SERVER_IMAGE.startsWith(MEDIASOUP_IMAGE)) { } else if (MEDIA_SERVER_IMAGE.startsWith(MEDIASOUP_IMAGE)) {
log.info("Starting mediaSoup"); log.info("Starting mediaSoup");
command = "LOG_DATE=$(printf '%(%Y-%m-%d-%H:%M:%S)T'); docker run --network=host --restart=always --env=KMS_MIN_PORT=40000 --env=KMS_MAX_PORT=65535" command = "LOG_DATE=$(printf '%(%Y-%m-%d-%H-%M-%S)T'); docker run --network=host --restart=always --env=KMS_MIN_PORT=40000 --env=KMS_MAX_PORT=65535"
+ " --env=OPENVIDU_PRO_LICENSE=" + OPENVIDU_PRO_LICENSE + " --env=OPENVIDU_PRO_LICENSE_API=" + " --env=OPENVIDU_PRO_LICENSE=" + OPENVIDU_PRO_LICENSE + " --env=OPENVIDU_PRO_LICENSE_API="
+ OPENVIDU_PRO_LICENSE_API + OPENVIDU_PRO_LICENSE_API
+ " --env=WEBRTC_LISTENIPS_0_ANNOUNCEDIP=172.17.0.1 --env=WEBRTC_LISTENIPS_0_IP=172.17.0.1" + " --env=WEBRTC_LISTENIPS_0_ANNOUNCEDIP=172.17.0.1 --env=WEBRTC_LISTENIPS_0_IP=172.17.0.1"
+ " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE + " >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log &"; + " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE
+ " >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log &";
} else { } else {
log.error("Unrecognized MEDIA_SERVER_IMAGE: {}", MEDIA_SERVER_IMAGE); log.error("Unrecognized MEDIA_SERVER_IMAGE: {}", MEDIA_SERVER_IMAGE);
System.exit(1); System.exit(1);
} }
commandLine.executeCommand(command, 60); commandLine.executeCommand(command, true, 60);
if (waitUntilKurentoClientReconnection) { if (waitUntilKurentoClientReconnection) {
try { try {
Thread.sleep(5000); Thread.sleep(5000);