From 3f689ebc75a42808fcd896c226a05933d440353d Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Mon, 26 Dec 2016 23:03:46 +0100
Subject: [PATCH] Test each server version separately

---
 .travis.yml | 59 ++++++++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index faeae291..e52e3779 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,13 +20,26 @@ env:
     - SERVER=httpd VERSION=apache-2.4
     - SERVER=httpd VERSION=nginx-stable
     - SERVER=httpd VERSION=nginx-mainline
-    #- SERVER=mysql
-    #- SERVER=pgsql
-    #- SERVER=php
-  #global:
-  #  - DEVILBOX_PHP_VERSION="$(   grep -Eo 'image:.*PHP.*:.*' docker-compose.yml   | sed 's/.*:.*://g' )"
-  #  - DEVILBOX_HTTPD_VERSION="$( grep -Eo 'image:.*HTTPD.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
-  #  - DEVILBOX_MYSQL_VERSION="$( grep -Eo 'image:.*MYSQL.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
+    # Test mysql
+    - SERVER=mysql VERSION=mysql-5.5
+    - SERVER=mysql VERSION=mysql-5.6
+    - SERVER=mysql VERSION=mysql-5.7
+    - SERVER=mysql VERSION=mariadb-5.5
+    - SERVER=mysql VERSION=mariadb-10.0
+    - SERVER=mysql VERSION=mariadb-10.1
+    - SERVER=mysql VERSION=mariadb-10.2
+    # Test pgsql
+    - SERVER=pgsql VERSION=9.2
+    - SERVER=pgsql VERSION=9.3
+    - SERVER=pgsql VERSION=9.4
+    - SERVER=pgsql VERSION=9.5
+    - SERVER=pgsql VERSION=9.6
+    # Test php
+    - SERVER=php VERSION=php-fpm-5.4
+    - SERVER=php VERSION=php-fpm-5.5
+    - SERVER=php VERSION=php-fpm-5.6
+    - SERVER=php VERSION=php-fpm-7.0
+    - SERVER=php VERSION=php-fpm-7.1
 
 
 ###
@@ -41,40 +54,8 @@ before_install:
   - uname -a
 
 
-###
-### Install
-###
-#install:
-#  # php
-#  - docker pull cytopia/php-fpm-5.4:${DEVILBOX_PHP_VERSION}
-#  - docker pull cytopia/php-fpm-5.5:${DEVILBOX_PHP_VERSION}
-#  - docker pull cytopia/php-fpm-5.6:${DEVILBOX_PHP_VERSION}
-#  - docker pull cytopia/php-fpm-7.0:${DEVILBOX_PHP_VERSION}
-#  - docker pull cytopia/php-fpm-7.1:${DEVILBOX_PHP_VERSION}
-#  # web
-#  - docker pull cytopia/apache-2.2:${DEVILBOX_HTTPD_VERSION}
-#  - docker pull cytopia/apache-2.4:${DEVILBOX_HTTPD_VERSION}
-#  - docker pull cytopia/nginx-stable:${DEVILBOX_HTTPD_VERSION}
-#  - docker pull cytopia/nginx-mainline:${DEVILBOX_HTTPD_VERSION}
-#  # mysql/mariadb
-#  - docker pull cytopia/mysql-5.5:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mysql-5.6:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mysql-5.7:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mariadb-5.5:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mariadb-10.0:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mariadb-10.1:${DEVILBOX_MYSQL_VERSION}
-#  - docker pull cytopia/mariadb-10.2:${DEVILBOX_MYSQL_VERSION}
-#  # postgresql (official images)
-#  - docker pull postgres:9.2
-#  - docker pull postgres:9.3
-#  - docker pull postgres:9.4
-#  - docker pull postgres:9.5
-#  - docker pull postgres:9.6
-
-
 ###
 ### Test
 ###
 script:
-  #- .tests/test_${SERVER}.sh .
   - .tests/test_single.sh . "${SERVER}" "${VERSION}"