More manylinux fixes

edenhill · edenhill · commit f768fffd2e48 · 2017-09-05T12:44:06.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,7 @@ script:
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then flake8 ; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then py.test -v --timeout 20 --ignore=tmp-build --import-mode append ; fi
  - if [[ ! -z $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse ; ls -la wheelhouse/ ; fi
- - if [[ $TRAVIS_OS_NAME == linux && ! -z $CIBW_BEFORE_BUILD ]]; then DOCKER_IMAGES=quay.io/pypa/manylinux1_x86_64:latest tools/test-manylinux.sh ; fi
+ - if [[ $TRAVIS_OS_NAME == linux && ! -z $CIBW_BEFORE_BUILD ]]; then DOCKER_IMAGES=centos:6.6 tools/test-manylinux.sh ; fi
 
 
 deploy:
diff --git a/tools/build-openssl.sh b/tools/build-openssl.sh
@@ -18,7 +18,8 @@ set -ex
 echo "# Building OpenSSL ${OPENSSL_VERSION}"
 
 
-if [[ ! -f build-openssl/config ]]; then
+if ! grep -q "^VERSION=${OPENSSL_VERSION}$" build-openssl/Makefile ; then
+    echo "No usable build-openssl directory: downloading ${OPENSSL_VERSION}"
     rm -rf build-openssl
     mkdir -p build-openssl
     pushd build-openssl
diff --git a/tools/test-manylinux.sh b/tools/test-manylinux.sh
@@ -24,7 +24,7 @@ function run_single_in_docker {
     # Run single test inside docker container
 
     # Detect OS
-    if grep -qi centos /etc/system-release ; then
+    if grep -qi centos /etc/system-release /etc/redhat-release ; then
         setup_centos
     elif grep -qi ubuntu /etc/os-release ; then
         setup_ubuntu
