From ecb77ddb56665b9ff3dbb46b5568aea3df5a50bd Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 10 Sep 2020 16:57:21 +0300 Subject: [PATCH] Add more travis tests (#289) * Add version variable for travis tests * Fix typo * Fix activemq variable * Add travis tests * Remove mysql latest * Fixes & refactoring * Add more travis tests * Remove mysql 8 test * Remove mysql 8 test [2] * Add mysql 8 comment * Fix mysql 8 auth plugin Co-authored-by: Alexey Golubev --- .travis.yml | 69 ++++++++++++++++++++++++++++++++++++++++------ tests/activemq.yml | 2 +- tests/mariadb.yml | 2 +- tests/mysql.yml | 3 +- tests/postgres.yml | 2 +- tests/rabbitmq.yml | 2 +- tests/redis.yml | 2 +- 7 files changed, 67 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37749d6..084cddc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - config: standalone.yml PRODUCT_NAME: documentserver-ie + # certificates (default tls if onlyoffice not exists) - config: certs.yml ssl: true @@ -30,10 +31,27 @@ env: SSL_CERTIFICATE_PATH: /var/www/onlyoffice/Data/certs/mycert.crt SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key - # postgresql + + # postgresql 12 + - config: postgres.yml + POSTGRES_VERSION: 12 + + # postgresql 11 + - config: postgres.yml + POSTGRES_VERSION: 11 + + # postgresql 10 + - config: postgres.yml + POSTGRES_VERSION: 10 + + # postgresql 9 + - config: postgres.yml + POSTGRES_VERSION: 9 + + # postgresql 9.5 - config: postgres.yml - # custom values + # postgresql custom values - config: postgres.yml DB_NAME: mydb DB_USER: myuser @@ -41,31 +59,64 @@ env: POSTGRES_DB: mydb POSTGRES_USER: myuser - # deprecated variables + # postgresql deprecated variables - config: postgres-old.yml - # mysql + + # mysql 8 + - config: mysql.yml + MYSQL_VERSION: 8 + + # mysql 5 + - config: mysql.yml + MYSQL_VERSION: 5 + + # mysql 5.7 - config: mysql.yml - # mariadb + + # mariadb 10 + - config: mariadb.yml + MARIADB_VERSION: 10 + + # mariadb 10.5 - config: mariadb.yml - # activemq + + - config: activemq.yml + ACTIVEMQ_VERSION: latest + + # activemq 5.14.3 - config: activemq.yml - # rabbitmq + + # rabbitmq latest - config: rabbitmq.yml + # rabbitmq 3 + - config: rabbitmq.yml + RABBITMQ_VERSION: 3 + # rabbitmq old variables - config: rabbitmq-old.yml - # redis with community edition + + # redis latest with community edition - config: redis.yml - # redis with integraion edition + # redis latest with integraion edition - config: redis.yml PRODUCT_NAME: documentserver-ie + # redis 6 + - config: redis.yml + REDIS_VERSION: 6 + + # redis 5 + - config: redis.yml + REDIS_VERSION: 5 + + # graphite - config: graphite.yml diff --git a/tests/activemq.yml b/tests/activemq.yml index 6c3aad7..5781c64 100644 --- a/tests/activemq.yml +++ b/tests/activemq.yml @@ -17,7 +17,7 @@ services: onlyoffice-activemq: container_name: onlyoffice-activemq - image: webcenter/activemq:5.14.3 + image: webcenter/activemq:${ACTIVEMQ_VERSION:-5.14.3} environment: - ACTIVEMQ_USERS_guest=${ACTIVEMQ_USERS_guest:-guest} - ACTIVEMQ_GROUPS_owners=${ACTIVEMQ_GROUPS_owners:-guest} diff --git a/tests/mariadb.yml b/tests/mariadb.yml index 91131e2..4bb8de5 100644 --- a/tests/mariadb.yml +++ b/tests/mariadb.yml @@ -20,7 +20,7 @@ services: onlyoffice-mariadb: container_name: onlyoffice-mariadb - image: mariadb:10.5 + image: mariadb:${MARIADB_VERSION:-10.5} environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice} diff --git a/tests/mysql.yml b/tests/mysql.yml index 1389a89..20fcd70 100644 --- a/tests/mysql.yml +++ b/tests/mysql.yml @@ -20,7 +20,8 @@ services: onlyoffice-mysql: container_name: onlyoffice-mysql - image: mysql:5.7 + image: mysql:${MYSQL_VERSION:-5.7} + command: --default-authentication-plugin=mysql_native_password environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice} diff --git a/tests/postgres.yml b/tests/postgres.yml index 6ddf134..8333b10 100644 --- a/tests/postgres.yml +++ b/tests/postgres.yml @@ -20,7 +20,7 @@ services: onlyoffice-postgresql: container_name: onlyoffice-postgresql - image: postgres:9.5 + image: postgres:${POSTGRES_VERSION:-9.5} environment: - POSTGRES_DB=${POSTGRES_DB:-onlyoffice} - POSTGRES_USER=${POSTGRES_USER:-onlyoffice} diff --git a/tests/rabbitmq.yml b/tests/rabbitmq.yml index f73501f..293045c 100644 --- a/tests/rabbitmq.yml +++ b/tests/rabbitmq.yml @@ -17,7 +17,7 @@ services: onlyoffice-rabbitmq: container_name: onlyoffice-rabbitmq - image: rabbitmq + image: rabbitmq:${RABBITMQ_VERSION:-latest} restart: always networks: - onlyoffice diff --git a/tests/redis.yml b/tests/redis.yml index 5f759ad..849be16 100644 --- a/tests/redis.yml +++ b/tests/redis.yml @@ -19,7 +19,7 @@ services: onlyoffice-redis: container_name: onlyoffice-redis - image: redis + image: redis:${REDIS_VERSION:-latest} restart: always networks: - onlyoffice