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

openvidu-test-e2e: pull DOCKER_ANDROID_IMAGE

pull/781/head
pabloFuente 2022-12-29 22:02:41 +01:00
parent bdb544ac4e
commit 5755412566
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci-scripts/commons.sh
View File

@ -86,6 +86,10 @@ if [[ "${PREPARE}" == true || "${EXECUTE_ALL}" == true ]]; then
if [[ -n "${EDGE_VERSION:-}" ]]; then
docker pull selenium/standalone-edge:"${EDGE_VERSION}"
fi
# Pull Docker Android image if env variable DOCKER_ANDROID_IMAGE is set
if [[ -n "${DOCKER_ANDROID_IMAGE:-}" ]]; then
docker pull "${DOCKER_ANDROID_IMAGE}"
fi
# Pull mediasoup and kurento
if [[ -n "${MEDIASOUP_CONTROLLER_VERSION:-}" ]]; then
@ -97,6 +101,8 @@ if [[ "${PREPARE}" == true || "${EXECUTE_ALL}" == true ]]; then
# Prepare directory for OpenVidu recordings
sudo mkdir -p /opt/openvidu/recordings && sudo chmod 777 /opt/openvidu/recordings
# Prepare directory for OpenVidu Android apps
sudo mkdir -p /opt/openvidu/android && sudo chmod 777 /opt/openvidu/android
# Configure Snapshots repository

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

@ -95,7 +95,7 @@ public class OpenViduTestE2e {
protected static String EDGE_VERSION = "latest";
protected static String OPENVIDU_DEPLOYMENT = "http://localhost:5000/";
final private static String DOCKER_ANDROID_IMAGE = "budtmo/docker-android-x86-12.0:latest";
protected static String DOCKER_ANDROID_IMAGE = "budtmo/docker-android-x86-12.0:latest";
protected static Exception ex = null;
protected final Object lock = new Object();
@ -312,6 +312,12 @@ public class OpenViduTestE2e {
DOCKERHUB_PRIVATE_REGISTRY_PASSWORD = dockerhubPrivateRegistryPassword;
}
String dockerAndroidImage = System.getProperty("DOCKER_ANDROID_IMAGE");
if (dockerAndroidImage != null && !dockerAndroidImage.isBlank()) {
DOCKER_ANDROID_IMAGE = dockerAndroidImage;
}
log.info("Using Docker Android image {}", DOCKER_ANDROID_IMAGE);
String openviduDeployment = System.getProperty("OPENVIDU_DEPLOYMENT");
if (openviduDeployment != null) {
OPENVIDU_DEPLOYMENT = openviduDeployment;