Merge remote-tracking branch 'origin/1.6' into 1.7

.travis.mk

@@ -6,10 +6,6 @@ DOCKER_IMAGE:=packpack/packpack:ubuntu-zesty
 
 all: package
 
-source:
-	git clone https://github.com/packpack/packpack.git packpack
-	TARBALL_COMPRESSOR=gz packpack/packpack tarball
-
 package:
 	git clone https://github.com/packpack/packpack.git packpack
 	./packpack/packpack
@@ -19,6 +15,8 @@ test: test_$(TRAVIS_OS_NAME)
 # Redirect some targets via docker
 test_linux: docker_test_ubuntu
 coverage: docker_coverage_ubuntu
+source: docker_source_ubuntu
+source_deploy: docker_source_deploy_ubuntu
 
 docker_%:
 	mkdir -p ~/.cache/ccache
@@ -40,7 +38,7 @@ deps_ubuntu:
 		libcurl4-openssl-dev libunwind-dev \
 		python python-pip python-setuptools python-dev \
 		python-msgpack python-yaml python-argparse python-six python-gevent \
-		lcov ruby
+		lcov ruby awscli
 
 test_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -79,3 +77,12 @@ coverage_ubuntu: deps_ubuntu
 		echo coveralls-lcov --repo-token [FILTERED] coverage.info; \
 		coveralls-lcov --repo-token $(COVERALLS_TOKEN) coverage.info; \
 	fi;
+
+source_ubuntu:
+	git clone https://github.com/packpack/packpack.git packpack
+	make -f ./packpack/pack/Makefile TARBALL_COMPRESSOR=gz tarball
+
+source_deploy_ubuntu:
+	aws --endpoint-url "${AWS_S3_ENDPOINT_URL}" s3 \
+		cp build/*.tar.gz "s3://tarantool-${TRAVIS_BRANCH}-src/" \
+		--acl public-read

.travis.yml

@@ -83,7 +83,6 @@ script:
 
 before_deploy:
   - ls -l build/
-  - pip install awscli --user
 
 deploy:
   # Deploy packages to PackageCloud
@@ -99,7 +98,7 @@ deploy:
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
   # Deploy sources to S3
   - provider: script
-    script: aws --endpoint-url "${AWS_S3_ENDPOINT_URL}" s3 cp build/*.tar.gz "s3://tarantool-${TRAVIS_BRANCH}-src/" --acl public-read
+    script: make -f .travis.mk source_deploy
     skip_cleanup: true
     on:
       branch: "1.7"