From d62eb1a5391527a6fbea5d2fdb01709780ec176e Mon Sep 17 00:00:00 2001
From: Eugine Blikh <bigbes@gmail.com>
Date: Sun, 4 Nov 2018 11:36:06 +0300
Subject: [PATCH] Update travis.yml

---
 .travis.mk              | 14 +++++++++++
 .travis.yml             | 52 +++++++++++++----------------------------
 lib/tarantool_server.py |  2 +-
 test.sh                 | 19 ---------------
 4 files changed, 31 insertions(+), 56 deletions(-)
 create mode 100644 .travis.mk
 delete mode 100644 test.sh

diff --git a/.travis.mk b/.travis.mk
new file mode 100644
index 0000000..5921a2e
--- /dev/null
+++ b/.travis.mk
@@ -0,0 +1,14 @@
+.PHONY: test
+
+all: package
+
+package:
+	git clone https://github.com/packpack/packpack.git packpack
+	packpack/packpack
+
+test:
+	curl -s https://packagecloud.io/install/repositories/tarantool/1_10/script.deb.sh | sudo bash
+	sudo apt install tarantool
+	phpize && ./configure && make all && sudo make install
+	sudo pip install PyYAML
+	./test-run.py
diff --git a/.travis.yml b/.travis.yml
index 5e0f327..b11d82a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@ services:
 
 language: php
 
-php:
-  - 7.0
-  - 7.1
-  - nightly
-
 python:
   - 2.7
 
@@ -17,43 +12,28 @@ cache: false
 env:
   global:
     - PRODUCT=php-tarantool
-  matrix:
-    - OS=el DIST=6 PACK=rpm
-    - OS=el DIST=7 PACK=rpm
-    - OS=fedora DIST=22 PACK=rpm
-    - OS=fedora DIST=23 PACK=rpm
-    - OS=fedora DIST=rawhide PACK=rpm
-    - OS=ubuntu DIST=trusty PACK=deb
-    - OS=ubuntu DIST=precise PACK=deb
-    - OS=ubuntu DIST=wily PACK=deb
-#    phpize is, currently, broken on xenial. can't test, still not stable
-#    - OS=ubuntu DIST=xenial PACK=deb
-    - OS=debian DIST=jessie PACK=deb
-    - OS=debian DIST=wheezy PACK=deb
-    - OS=debian DIST=stretch PACK=deb
-    - OS=debian DIST=sid PACK=deb
-    - PACK=none
 
 # multiple php version exclusion matrix
 matrix:
+  include:
+    - { env: TARGET=test, php: 7.1     }
+    - { env: TARGET=test, php: nightly }
   fast_finish: true
-  allow_failures:
-    - env: OS=el DIST=6 PACK=rpm
-    - env: OS=el DIST=7 PACK=rpm
-    - env: OS=fedora DIST=22 PACK=rpm
-    - env: OS=fedora DIST=23 PACK=rpm
-    - env: OS=fedora DIST=rawhide PACK=rpm
-    - env: OS=ubuntu DIST=precise PACK=deb
-    - env: OS=ubuntu DIST=trusty PACK=deb
-    - env: OS=ubuntu DIST=wily PACK=deb
-    - env: OS=debian DIST=jessie PACK=deb
-    - env: OS=debian DIST=wheezy PACK=deb
-    - env: OS=debian DIST=stretch PACK=deb
-    - env: OS=debian DIST=sid PACK=deb
+  allowed_failures:
+    - OS=el     DIST=6
+    - OS=el     DIST=7
+    - OS=fedora DIST=26
+    - OS=fedora DIST=27
+    - OS=ubuntu DIST=trusty
+    - OS=ubuntu DIST=xenial
+    - OS=ubuntu DIST=artful
+    - OS=ubuntu DIST=bionic
+    - OS=debian DIST=wheezy
+    - OS=debian DIST=jessie
+    - OS=debian DIST=stretch
 
 script:
-  - git clone https://github.com/packpack/packpack.git packpack
-  - packpack/packpack;
+  - make -f .travis.mk ${TARGET}
 
 notifications:
   email: true
diff --git a/lib/tarantool_server.py b/lib/tarantool_server.py
index dbe1481..fbb6fa4 100644
--- a/lib/tarantool_server.py
+++ b/lib/tarantool_server.py
@@ -245,7 +245,7 @@ def start(self):
         self.generate_configuration()
         if self.script:
             shutil.copy(self.script, self.script_dst)
-            os.chmod(self.script_dst, 511)
+            os.chmod(self.script_dst, 0o777)
         args = self.prepare_args()
         self.process = subprocess.Popen(args,
                 cwd = self.vardir,
diff --git a/test.sh b/test.sh
deleted file mode 100644
index 7bdd725..0000000
--- a/test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-curl http://download.tarantool.org/tarantool/1.6/gpgkey | sudo apt-key add -
-release=`lsb_release -c -s`
-
-# append two lines to a list of source repositories
-sudo rm -f /etc/apt/sources.list.d/*tarantool*.list
-sudo tee /etc/apt/sources.list.d/tarantool_1_6.list <<- EOF
-deb http://download.tarantool.org/tarantool/1.6/ubuntu/ $release main
-EOF
-
-# install
-sudo apt-get update > /dev/null
-sudo apt-get -qy install tarantool tarantool-dev
-
-tarantool --version
-phpize && ./configure
-make
-make install
-sudo pip install PyYAML
-/usr/bin/python test-run.py