From be262947771217f23da1a4e13026c2359c319cb8 Mon Sep 17 00:00:00 2001
From: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Wed, 9 Sep 2020 16:45:09 +0300
Subject: [PATCH] Fixes & refactoring

---
 .travis.yml            | 51 +++++++++++++++++++++++++-----------------
 tests/postgres-old.yml |  2 +-
 tests/rabbitmq-old.yml |  2 +-
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 038967c..6502930 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
@@ -31,10 +32,18 @@ env:
     SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key
 
 
+  # postgresql latest
+  - config: postgres.yml
+    POSTGRES_VERSION: latest
+
+  # 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
@@ -42,41 +51,41 @@ env:
     POSTGRES_DB: mydb
     POSTGRES_USER: myuser
 
-  # postgresql 9
-  - config: postgres.yml
-    POSTGRES_VERSION: 
-
-  # postgresql latest
-  - config: postgres.yml
-    POSTGRES_VERSION: latest
-
-  # deprecated variables
+  # postgresql deprecated variables
   - config: postgres-old.yml
 
 
-  # mysql 5.7
-  - config: mysql.yml
-
   # mysql 5
   - config: mysql.yml
     MYSQL_VERSION: 5
 
+  # mysql 5.7
+  - config: mysql.yml
 
-  # mariadb 10.5
-  - config: mariadb.yml
 
   # mariadb latest
   - config: mariadb.yml
     MARIADB_VERSION: latest
 
+  # mariadb 10
+  - config: mariadb.yml
+    MARIADB_VERSION: 10
+
+  # mariadb 10.5
+  - config: mariadb.yml
 
-  # activemq 5.14.3
-  - config: activemq.yml
 
   # activemq latest
   - config: activemq.yml
     ACTIVEMQ_VERSION: latest
 
+  # activemq 5
+  - config: activemq.yml
+    ACTIVEMQ_VERSION: 5
+
+  # activemq 5.14.3
+  - config: activemq.yml
+
 
   # rabbitmq latest
   - config: rabbitmq.yml
@@ -92,14 +101,14 @@ env:
   # redis latest with community edition
   - config: redis.yml
 
+  # redis 5
+  - config: redis.yml
+    REDIS_VERSION: 5
+
   # redis latest with integraion edition
   - config: redis.yml
     PRODUCT_NAME: documentserver-ie
 
-  # redis 5 with community edition
-  - config: redis.yml
-    REDIS_VERSION: 5
-
 
   # graphite
   - config: graphite.yml
diff --git a/tests/postgres-old.yml b/tests/postgres-old.yml
index 0efc66f..237246c 100644
--- a/tests/postgres-old.yml
+++ b/tests/postgres-old.yml
@@ -19,7 +19,7 @@ services:
 
   onlyoffice-postgresql:
     container_name: onlyoffice-postgresql
-    image: postgres:${POSTGRES_VERSION:-9.5}
+    image: postgres:9.5
     environment:
       - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
       - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
diff --git a/tests/rabbitmq-old.yml b/tests/rabbitmq-old.yml
index 63d3029..ce18691 100644
--- a/tests/rabbitmq-old.yml
+++ b/tests/rabbitmq-old.yml
@@ -17,7 +17,7 @@ services:
 
   onlyoffice-rabbitmq:
     container_name: onlyoffice-rabbitmq
-    image: rabbitmq:${RABBITMQ_VERSION:-latest}
+    image: rabbitmq
     restart: always
     networks:
      - onlyoffice