Update travis config (PyMySQL#595)

methane · web-flow · commit e027812ab0ea · 2017-08-30T21:17:46.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,53 +1,49 @@
 sudo: required
-dist: trusty
 language: python
 python:
   - "3.7-dev"
   - "3.6"
-  - "2.6"
-  - "pypy3.3-5.2-alpha1"
 
 cache: pip
 
 matrix:
   include:
     - addons:
-       mariadb: 5.5
+        mariadb: 5.5
       python: "3.5"
 
     - addons:
-       mariadb: 10.0
+        mariadb: 10.1
       python: "pypy"
 
     - addons:
-       mariadb: 10.1
+        mariadb: 10.2
       python: "2.7"
 
     - env:
-       - DB=5.6.35
+        - DB=5.6.37
+      python: "3.3"
       addons:
         apt:
           packages:
             - libaio-dev
-      python: "3.3"
+            - libnuma-dev
 
     - env:
-       - DB=5.7.17
+        - DB=5.7.19
+      python: "3.4"
       addons:
         apt:
           packages:
             - libaio-dev
-      python: "3.4"
+            - libnuma-dev
 
 
 
 # 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
 # really only need libaio1 for DB builds however libaio-dev is whitelisted for container builds and liaio1 isn't
 install:
-    - if [ -n "${EXTRAPKG}" ]; then
-          sudo apt-get install ${EXTRAPKG};
-      fi
     - export PASSWORD=travis;
     - pip install -U coveralls unittest2 coverage
 
diff --git a/.travis/initializedb.sh b/.travis/initializedb.sh
@@ -9,11 +9,12 @@ if [ ! -z "${DB}" ]; then
     # disable existing database server in case of accidential connection
     mysql -u root -e 'drop user travis@localhost; drop user root@localhost; drop user travis; create user super@localhost; grant all on *.* to super@localhost with grant option'
     mysql -u super -e 'drop user root'
-    F=mysql-${DB}-linux-glibc2.5-x86_64
+
+    F=mysql-${DB}-linux-glibc2.12-x86_64
     mkdir -p ${HOME}/mysql
     P=${HOME}/mysql/${F} 
     if [ ! -d "${P}" ]; then
-        wget http://cdn.mysql.com/Downloads/MySQL-${DB%.*}/${F}.tar.gz -O - | tar -zxf - --directory=${HOME}/mysql 
+        wget https://cdn.mysql.com//Downloads/MySQL-${DB%.*}/${F}.tar.gz -O - | tar -zxf - --directory=${HOME}/mysql
     fi
     if [ -f "${P}"/my.cnf ]; then
         O="--defaults-file=${P}/my.cnf" 
@@ -37,9 +38,10 @@ if [ ! -z "${DB}" ]; then
      openssl rsa -in "${P}"/private_key.pem -pubout -out "${P}"/public_key.pem
     ${P}/bin/mysqld_safe ${O} --ledir=/ --mysqld=${P}/bin/mysqld  --datadir=${HOME}/db-${DB} --socket=/tmp/mysql.sock --port 3307 --innodb-buffer-pool-size=200M  --lc-messages-dir=${P}/share --plugin-dir=${P}/lib/plugin/ --log-error=/tmp/mysql.err &
     while [ ! -S /tmp/mysql.sock  ]; do
-       sleep 2
+       sleep 3
+       tail /tmp/mysql.err
     done
-    cat /tmp/mysql.err
+    tail /tmp/mysql.err
     if [ ! -z "${PASSWD}" ]; then
         ${P}/bin/mysql -S /tmp/mysql.sock -u root -p"${PASSWD}" --connect-expired-password -e "SET PASSWORD = PASSWORD('')"
     fi
