diff --git a/ci-scripts/commons.sh b/ci-scripts/commons.sh index b8fb4af2..bedf7473 100755 --- a/ci-scripts/commons.sh +++ b/ci-scripts/commons.sh @@ -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 diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java index ece44f98..fedfc0fc 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java @@ -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;