More travis fixes

edenhill · edenhill · commit 792851e22918 · 2017-09-05T11:33:58.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
 #env:
 #  global:
   # Wheel tests are not working due to some .cimpl import weirdness.
-  #- CIBW_TEST_REQUIRES="pytest requests avro"
-  #- CIBW_TEST_COMMAND="pytest {project}/tests"
+  #-  CIBW_TEST_REQUIRES="pytest requests avro" CIBW_TEST_COMMAND="pytest {project}/tests"
 
 matrix:
  include:
@@ -11,7 +10,7 @@ matrix:
   - os: linux
     dist: trusty
     sudo: required
-    env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh"
+    env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh master"
     language: python
     python: "2.7"
     services: docker
@@ -23,6 +22,10 @@ script:
 - cibuildwheel --output-dir wheelhouse
 - ls -la wheelhouse/
 
+test:
+- if [[ $TRAVIS_OS_NAME == linux ]]; then DOCKER_IMAGES=quay.io/pypa/manylinux1_x86_64:latest tools/test-manylinux.sh ; fi
+
+
 deploy:
   provider: s3
   access_key_id:
diff --git a/tools/bootstrap-librdkafka.sh b/tools/bootstrap-librdkafka.sh
@@ -26,7 +26,7 @@ mkdir -p "$PREFIXDIR/librdkafka"
 pushd "$PREFIXDIR/librdkafka"
 
 test -f configure ||
-curl -sL "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" | \
+curl -L "https://github.com/edenhill/librdkafka/archive/${VERSION}.tar.gz" | \
     tar -xz --strip-components=1 -f -
 
 ./configure --clean
diff --git a/tools/build-openssl.sh b/tools/build-openssl.sh
diff --git a/tools/prepare-cibuildwheel-linux.sh b/tools/prepare-cibuildwheel-linux.sh
@@ -3,6 +3,15 @@
 
 # cibuildwheel builder for Linux
 
+LIBRDKAFKA_VERSION=$1
+
+if [[ -z $LIBRDKAFKA_VERSION ]]; then
+    echo "Usage: $0 <librdkafka-version/tag/gitref>"
+    exit 1
+fi
+
+set -ex
+
 echo "# Installing basic system dependencies"
 yum install -y zlib-devel gcc-c++
 
diff --git a/tools/test-manylinux.sh b/tools/test-manylinux.sh
@@ -5,6 +5,7 @@
 
 set -ex
 
+echo "$0 running from $(pwd): $*"
 
 function setup_centos {
     # CentOS container setup
@@ -39,6 +40,13 @@ function run_single_in_docker {
     pip install confluent_kafka --no-index -f /io/wheelhouse
     pip install pytest
 
+    # Verify that OpenSSL and zlib are properly linked
+    python -c '
+import confluent_kafka
+
+p = confluent_kafka.Producer({"ssl.cipher.suites":"DEFAULT",
+                              "compression.codec":"gzip"})
+'
 
     pushd /io/tests
     # Remove cached files from previous runs
