Travis: use docker for mysql-5.5, mysql-5.6, mariadb-5.5, 10.0, 10.1, 10.2, 10.3 (PyMySQL#662)

grooverdan · methane · commit 217666d3d6ad · 2018-04-30T23:30:07.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,32 +2,37 @@
 
 sudo: required
 language: python
-python:
-  - "3.7-dev"
-  - "3.6"
+services:
+  - docker
 
 cache: pip
 
 matrix:
   include:
-    - addons:
-        mariadb: 5.5
+    - env:
+        - DB=mariadb:5.5
       python: "3.5"
-
-    - addons:
-        mariadb: 10.1
+    - env:
+        - DB=mariadb:10.0
+      python: "3.6"
+    - env:
+        - DB=mariadb:10.1
       python: "pypy"
-
-    - addons:
-        mariadb: 10.2
+    - env:
+        - DB=mariadb:10.2
       python: "2.7"
-
     - env:
-        - DB=5.7
+        - DB=mariadb:10.3
+      python: "3.7-dev"
+    - env:
+        - DB=mysql:5.5
+      python: "3.5"
+    - env:
+        - DB=mysql:5.6
+      python: "3.6"
+    - env:
+        - DB=mysql:5.7
       python: "3.4"
-      services:
-        - docker
-
 
 # different py version from 5.6 and 5.7 as cache seems to be based on py version
 # http://dev.mysql.com/downloads/mysql/5.7.html has latest development release version
diff --git a/.travis/initializedb.sh b/.travis/initializedb.sh
@@ -9,8 +9,8 @@ if [ ! -z "${DB}" ]; then
     # disable existing database server in case of accidential connection
     sudo service mysql stop
 
-    docker pull mysql:${DB}
-    docker run -it --name=mysqld -d -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -p 3306:3306 mysql:${DB}
+    docker pull ${DB}
+    docker run -it --name=mysqld -d -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -p 3306:3306 ${DB}
     sleep 10
 
     while :
