Try fix travis i386

.travis.yml

@@ -16,10 +16,10 @@ matrix:
           packages: [ g++-7,            libicu-dev, libreadline-dev, libmysqlclient-dev, unixodbc-dev, libltdl-dev, libssl-dev, libboost-dev, zlib1g-dev, libdouble-conversion-dev, libzookeeper-mt-dev, libsparsehash-dev, librdkafka-dev, libcapnp-dev, libsparsehash-dev, libgoogle-perftools-dev, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo ]
 
       env:
-        - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7 && export TEST_RUN="
+        - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7"
 
       script:
-        - utils/travis/normal.sh
+        - env TEST_RUN= utils/travis/normal.sh
 
 
     # We need to have gcc7 headers to compile c++17 code on clang
@@ -77,10 +77,10 @@ matrix:
           packages: [ pbuilder, fakeroot, debhelper ]
 
       env:
-        - MATRIX_EVAL="export ARCH=i386 && export TEST_RUN="
+        - MATRIX_EVAL="export ARCH=i386"
 
       script:
-        - utils/travis/pbuilder.sh
+        - env PBUILDER_TIMEOUT=40m TEST_TRUE=true TEST_RUN= utils/travis/pbuilder.sh
 
 
 # TODO: Can't bootstrap bionic on trusty host

debian/pbuilder-hooks/B90test-server

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e 
+set -e
 set -x
 
 for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
@@ -27,7 +27,7 @@ clickhouse-client -q "SELECT * from system.build_options;"
 clickhouse-client -q "SELECT toDateTime(1);"
 
 
-[ "${TEST_RUN}" ] && clickhouse-test --queries /usr/share/clickhouse-test/queries --tmp /tmp/clickhouse-test/ ${TEST_OPT} || ${TEST_TRUE:=true}
+( [ "${TEST_RUN}" ] && clickhouse-test --queries /usr/share/clickhouse-test/queries --tmp /tmp/clickhouse-test/ ${TEST_OPT} ) || ${TEST_TRUE:=true}
 
 
 service clickhouse-server stop

utils/travis/pbuilder.sh

@@ -16,7 +16,7 @@ env TEST_RUN=${TEST_RUN=1} \
     TEST_OPT="--no-long --skip 00281 00416 $TEST_OPT" \
     TEST_TRUE=${TEST_TRUE=false} \
     `# travisci will not upload ccache cache after timeout (48min), use our less timeout` \
-    PBUILDER_OPT="--timeout 35m $PBUILDER_OPT" \
+    PBUILDER_OPT="--timeout ${PBUILDER_TIMEOUT:=35m} $PBUILDER_OPT" \
     `# clang faster than gcc` \
     DEB_CC=${DEB_CC=$CC} DEB_CXX=${DEB_CXX=$CXX} \
     CCACHE_SIZE=${CCACHE_SIZE:=4G} SET_CCACHEDIR=${SET_CCACHEDIR:=$HOME/.ccache} \