debug: only run mach bootstrap on travis

.travis.yml

@@ -6,77 +6,77 @@ language: cpp
 # sudo: required and dist: trusty enable usage of Trusty
 matrix:
   include:
-    # Salt from scratch
-    - env:
-        - SALT_NODE_ID=servo-linux-cross1
-        - SALT_FROM_SCRATCH=true
-      os: linux
-      sudo: required
-      dist: trusty
-    - env:
-        - SALT_NODE_ID=servo-mac1
-        - SALT_FROM_SCRATCH=true
-      os: osx
-      osx_image: xcode7.3
-    - env:
-        - SALT_NODE_ID=servo-linux1
-        - SALT_FROM_SCRATCH=true
-      os: linux
-      sudo: required
-      dist: trusty
-    - env:
-        - SALT_NODE_ID=servo-master1
-        - SALT_FROM_SCRATCH=true
-      os: linux
-      sudo: required
-      dist: trusty
-    # Salt from previous configuration
-    - env:
-        - SALT_NODE_ID=servo-linux-cross1
-        - SALT_FROM_SCRATCH=false
-      os: linux
-      sudo: required
-      dist: trusty
-    - env:
-        - SALT_NODE_ID=servo-mac1
-        - SALT_FROM_SCRATCH=false
-      os: osx
-      osx_image: xcode7.3
-    - env:
-        - SALT_NODE_ID=servo-linux1
-        - SALT_FROM_SCRATCH=false
-      os: linux
-      sudo: required
-      dist: trusty
-    - env:
-        - SALT_NODE_ID=servo-master1
-        - SALT_FROM_SCRATCH=false
-      os: linux
-      sudo: required
-      dist: trusty
-    # Salt inside Docker
-    - env:
-        - SALT_NODE_ID=servo-linux1
-        - SALT_FROM_SCRATCH=true
-          # ubuntu/14.04
-        - SALT_DOCKER_IMAGE=ubuntu@sha256:edf05697d8ea17028a69726b4b450ad48da8b29884cd640fec950c904bfb50ce
-      os: linux
-      sudo: required
-      dist: trusty
-    - env:
-        - SALT_NODE_ID=servo-linux1
-        - SALT_FROM_SCRATCH=true
-          # ubuntu/16.04
-        - SALT_DOCKER_IMAGE=ubuntu@sha256:f3a61450ae43896c4332bda5e78b453f4a93179045f20c8181043b26b5e79028
-      os: linux
-      sudo: required
-      dist: trusty
-    # Not a Salt node, runs test suite instead
-    - env:
-        - SALT_NODE_ID=test
-      os: linux
-      sudo: required
-      dist: trusty
+          #    # Salt from scratch
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux-cross1
+          #        - SALT_FROM_SCRATCH=true
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    - env:
+          #        - SALT_NODE_ID=servo-mac1
+          #        - SALT_FROM_SCRATCH=true
+          #      os: osx
+          #      osx_image: xcode7.3
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux1
+          #        - SALT_FROM_SCRATCH=true
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    - env:
+          #        - SALT_NODE_ID=servo-master1
+          #        - SALT_FROM_SCRATCH=true
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    # Salt from previous configuration
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux-cross1
+          #        - SALT_FROM_SCRATCH=false
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    - env:
+          #        - SALT_NODE_ID=servo-mac1
+          #        - SALT_FROM_SCRATCH=false
+          #      os: osx
+          #      osx_image: xcode7.3
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux1
+          #        - SALT_FROM_SCRATCH=false
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    - env:
+          #        - SALT_NODE_ID=servo-master1
+          #        - SALT_FROM_SCRATCH=false
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    # Salt inside Docker
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux1
+          #        - SALT_FROM_SCRATCH=true
+          #          # ubuntu/14.04
+          #        - SALT_DOCKER_IMAGE=ubuntu@sha256:edf05697d8ea17028a69726b4b450ad48da8b29884cd640fec950c904bfb50ce
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    - env:
+          #        - SALT_NODE_ID=servo-linux1
+          #        - SALT_FROM_SCRATCH=true
+          #          # ubuntu/16.04
+          #        - SALT_DOCKER_IMAGE=ubuntu@sha256:f3a61450ae43896c4332bda5e78b453f4a93179045f20c8181043b26b5e79028
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
+          #    # Not a Salt node, runs test suite instead
+          #    - env:
+          #        - SALT_NODE_ID=test
+          #      os: linux
+          #      sudo: required
+          #      dist: trusty
     # Check that mach bootstrap works
     - env:
         - SALT_NODE_ID=mach-bootstrap

.travis/dispatch.sh

@@ -45,7 +45,7 @@ run_inside_docker() {
     # Reexec this script inside docker
     # (without exporting the `SALT_DOCKER_IMAGE` environment variable
     # to prevent recursion)
-    local -r DOCKER_SALT_ROOT="/tmp/salt"
+    local -r DOCKER_SALT_ROOT="/tmp/saltfs"
 
     # Use an env file for variables which may or may not be present
     local -r DOCKER_ENV_FILE="/tmp/docker-env-file"
@@ -100,9 +100,9 @@ elif [[ "${SALT_NODE_ID}" == "mach-bootstrap" ]]; then
     # so that `python-apt` is available
     export PATH="/usr/bin:${PATH}"
 
-    # Install git (not present by default in Docker)
-    sudo apt-get update
-    sudo apt-get -y install git
+    # Install basic deps (not present by default in Docker)
+    ${SUDO} apt-get update
+    ${SUDO} apt-get -y install git python-apt python-dev python-pip python-virtualenv
 
     # Run mach bootstrap test separately from `test` because it installs things
     git clone --depth 1 https://github.com/servo/servo.git ../servo