Troubleshooting OSX

Author: elgalu

.travis.yml

@@ -1,6 +1,7 @@
 # Even though we run everything inside docker Travis require
 # us to pick a language else it will pick Ruby by default
 # language: generic
+# language: ruby
 language: python
 
 # Omit running tests on temporal branches,
@@ -13,25 +14,26 @@ env:
   global:
     - TEST_SLEEPS="0.7"
 
-sudo: required
-dist: trusty
-services:
-  - docker
+# sudo: required
+# dist: trusty
+# services:
+#   - docker
 
 matrix:
-  # allow_failures:
-  #   # Currently erroring in Mac (OSX):
-  #   #  https://travis-ci.org/elgalu/docker-selenium/jobs/143553463#L636
-  #   #   com.docker.docker Incompatible CPU detected
-  #   #   Docker requires a processor with virtualization capabilities
-  #   - env:
-  #       - DOCKER_VERSION="1.12.1"
-  #         DOCKER_COMPOSE_VERSION="1.8.1"
-  #         OPERATING_SYSTEM="osx"
+  allow_failures:
+    # Currently erroring in Mac (OSX):
+    #  https://travis-ci.org/elgalu/docker-selenium/jobs/143553463#L636
+    #   com.docker.docker Incompatible CPU detected
+    #   Docker requires a processor with virtualization capabilities
+    - env:
+        - DOCKER_VERSION="1.12.1"
+          DOCKER_COMPOSE_VERSION="1.8.1"
+          OPERATING_SYSTEM="osx"
   include:
     # Linux with docker:stable compose:stable
     # Use DOCKER_PUSH_LATEST=false to debug
     - os: linux
+      language: python
       sudo: required
       dist: trusty
       services:
@@ -43,6 +45,7 @@ matrix:
           DOCKER_PUSH_LATEST=false
     # Linux with docker:beta/older compose:beta/older
     - os: linux
+      language: python
       sudo: required
       dist: trusty
       services:
@@ -52,6 +55,7 @@ matrix:
           DOCKER_COMPOSE_VERSION="1.8.0"
     # Linux with docker:stable compose:beta/older
     - os: linux
+      language: python
       sudo: required
       dist: trusty
       services:
@@ -61,6 +65,7 @@ matrix:
           DOCKER_COMPOSE_VERSION="1.8.0"
     # Linux with docker:beta/older compose:stable
     - os: linux
+      language: python
       sudo: required
       dist: trusty
       services:

test/before_install_setup

@@ -7,10 +7,9 @@ set -xe
 # Docker
 docker --version || echo "INFO: No docker installed yet"
 if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-  # Let's wait until Travis provides Docker for OSX
-  docker --version || exit 0
-  docker --version && exit 1 #that's how I'll know
-
+  # # Let's wait until Travis provides Docker for OSX
+  # docker --version || exit 0
+  # docker --version && exit 1 #that's how I'll know
   ./test/before_install_docker_osx
 else
   sudo -E bash -c './test/before_install_docker_linux'