From f3c34209051d0aea175d62c3facac143fabc2311 Mon Sep 17 00:00:00 2001 From: Ernestas Poskus Date: Mon, 24 Jul 2017 11:58:43 +0300 Subject: [PATCH 1/2] Specify exact java_package to install for test dependencies --- tests/dependencies.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/dependencies.yml b/tests/dependencies.yml index caee066..e18176a 100644 --- a/tests/dependencies.yml +++ b/tests/dependencies.yml @@ -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 From e2bf570c8c099ba73166cb71fbbe3d060a1e0636 Mon Sep 17 00:00:00 2001 From: Ernestas Poskus Date: Mon, 24 Jul 2017 10:27:14 +0300 Subject: [PATCH 2/2] Remove .travis specific docker version constraint --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3e050b..a430a52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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'