Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable usage of the Trusty beta on Travis #144

Merged
merged 2 commits into from Nov 1, 2015
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -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
@@ -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
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.