From 6aae7a9edf8092c27a5e1adb664770727313e0b2 Mon Sep 17 00:00:00 2001
From: "daniel.pondruff" <daniel.pondruff@open-xchange.com>
Date: Wed, 25 Sep 2019 14:58:46 +0200
Subject: [PATCH] add codecept tests
---
docker-compose.yml | 17 +++--------------
docker/config | 13 +++++++++++++
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e67dc79..3023b49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -63,25 +63,14 @@ services:
- "internal-net"
restart: always
test-container:
- image: 'gitlab.open-xchange.com:4567/docker/infrastructure/testing-codecept:develop'
- environment:
- - OX_ENV_UI_TESTING_ENABLED=1
- - OX_ENV_UI_TESTING_AUTOSTART=0
- - OX_ENV_UI_TESTING_CONFIG_MXDOMAIN=docker.qa.open-xchange.com
- - OX_ENV_UI_TESTING_CONFIG_CONTEXTID=1337
- - OX_ENV_UI_TESTING_GREP=C7336
- - ENV_TESTING_IMAGE_TAG=develop
- - ENV_SELENIUM_HOST=selenium-chrome-develop
- - ENV_SELENIUM_IMAGE_TAG=develop
- - OX_TESTING_POSTMAN_ENABLE=false
- - OX_ENV_UI_TESTING_MULTIPLE_ENABLED=0
- - OX_ENV_UI_TESTING_MULTIPLE_CHUNKS=50
- - OX_ENV_UI_TESTING_REPO_BRANCH=develop
+ image: 'gitlab.open-xchange.com:4567/docker/infrastructure/testing-codecept:ox-installer'
+ env_file: docker/config
volumes:
- "${PWD}/test-results/codeceptjs:/opt/open-xchange/tests/results/codeceptjs"
- "${PWD}/test-results/postman:/opt/open-xchange/tests/results/postman"
networks:
- internal-net
+ entrypoint: /opt/open-xchange/tests/ox_installer.sh
selenium-chrome:
image: selenium/standalone-chrome:3.141.59-titanium
hostname: selenium-chrome-develop
diff --git a/docker/config b/docker/config
index dfd2342..1234ad9 100755
--- a/docker/config
+++ b/docker/config
@@ -40,3 +40,16 @@ INSTALL_DOVECOT=false
OX_ENV_QA=true
+OX_CLIENT_ONBOARDING=true
+
+OX_ENV_QA_TESTING_UI_ENABLED=true
+OX_ENV_QA_TESTING_UI_AUTOSTART=true
+OX_ENV_QA_TESTING_UI_REPO_URL=https://gitlab.open-xchange.com/frontend/core
+OX_ENV_QA_TESTING_UI_REPO_BRANCH=develop
+OX_ENV_QA_TESTING_UI_URL_PROVISIONING=http://singlenode/
+OX_ENV_QA_TESTING_UI_URL_APPSUITE=http://singlenode/appsuite
+OX_ENV_QA_TESTING_UI_MXDOMAIN=${OX_MAIL_DOMAIN}
+OX_ENV_QA_TESTING_UI_CONTEXTID=1337
+OX_ENV_QA_TESTING_UI_SELENIUM_HOST=selenium-chrome-develop
+OX_ENV_QA_TESTING_UI_IMAP_SERVER=dovecot
+OX_ENV_QA_TESTING_UI_SMTP_SERVER=dovecot
--
GitLab