Skip to content

Commit

Permalink
Merge pull request #80 from ernestas-poskus/travis/remove_specific_do…
Browse files Browse the repository at this point in the history
…cker_version_constraint

Remove .travis specific docker version constraint
  • Loading branch information
ernestas-poskus authored Jul 24, 2017
2 parents 901845f + e2bf570 commit 28ff76b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
sudo: required

env:
global:
# https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
DOCKER_VERSION: "1.9.1-0~trusty"
matrix:
- distro: ernestasposkus/centos7
init: /usr/lib/systemd/systemd
Expand All @@ -22,11 +19,7 @@ services:
- docker

before_install:
# Downgrade to specific version of Docker engine.
- sudo apt-get update
- sudo apt-get remove docker-engine -yq
- sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"

# Pull container.
- 'sudo docker pull ${distro}:latest'

Expand Down
18 changes: 18 additions & 0 deletions tests/dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
---
- hosts: localhost
connection: local
remote_user: root
tasks:
- name: installing repo for Java 8 in Ubuntu
apt_repository: repo='ppa:openjdk-r/ppa'
when:
- ansible_os_family == 'Debian'

- hosts: localhost
connection: local
remote_user: root
roles:
- role: geerlingguy.java
java_packages:
- openjdk-8-jdk
when: ansible_os_family == 'Debian'

- role: geerlingguy.java
java_packages:
- java-1.8.0-openjdk
when: ansible_os_family == 'RedHat'

- role: AnsibleShipyard.ansible-zookeeper

0 comments on commit 28ff76b

Please sign in to comment.