diff --git a/.travis.yml b/.travis.yml index 1828eb4c..58f0d04f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,33 @@ language: cpp # NOTE: Make sure the matrix covers all node types in top.sls +# sudo: required and dist: trusty enable usage of Trusty matrix: include: - - os: linux - env: SALT_NODE_ID=servo-master - - os: linux - env: SALT_NODE_ID=servo-linux1 - - os: osx - env: SALT_NODE_ID=servo-mac1 - - os: osx - env: SALT_NODE_ID=servo-macpro1 - - os: linux - env: SALT_NODE_ID=linux1 - - os: linux - env: SALT_NODE_ID=servo-linux-android1 - - os: linux - env: SALT_NODE_ID=servo-head + - env: SALT_NODE_ID=servo-master + os: linux + sudo: required + dist: trusty + - env: SALT_NODE_ID=servo-linux1 + os: linux + sudo: required + dist: trusty + - env: SALT_NODE_ID=servo-mac1 + os: osx + - env: SALT_NODE_ID=servo-macpro1 + os: osx + - env: SALT_NODE_ID=linux1 + os: linux + sudo: required + dist: trusty + - env: SALT_NODE_ID=servo-linux-android1 + os: linux + sudo: required + dist: trusty + - env: SALT_NODE_ID=servo-head + os: linux + sudo: required + dist: trusty before_install: - .travis/install_salt diff --git a/.travis/install_salt b/.travis/install_salt index 9f5bcda6..1f185058 100755 --- a/.travis/install_salt +++ b/.travis/install_salt @@ -4,9 +4,9 @@ if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then printf "$0: installing salt for Linux\n" - # Travis uses Ubuntu 12.04 (Precise Pangolin) - wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu12/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - - printf 'deb http://repo.saltstack.com/apt/ubuntu/ubuntu12/2015.5 precise main\n' | sudo tee -a /etc/apt/sources.list >/dev/null + # Use Trusty (Ubuntu 14.04) on Travis + curl https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - + printf 'deb http://repo.saltstack.com/apt/ubuntu/ubuntu14/2015.5 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null sudo apt-get -y update sudo apt-get -y install salt-minion=2015.5.6+ds-1 elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then