From 85e137bbadaf7d72569e52c047f2f5fd28919deb Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 17 Mar 2015 13:52:44 -0700 Subject: [PATCH] Attempt to enable docker tests for rhel/centos6 as well --- .../roles/test_docker/tasks/docker-setup-rht.yml | 16 +++++++++++++++- .../integration/roles/test_docker/tasks/main.yml | 7 +++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml b/test/integration/roles/test_docker/tasks/docker-setup-rht.yml index 26373e4d3c..d141bddc55 100644 --- a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml +++ b/test/integration/roles/test_docker/tasks/docker-setup-rht.yml @@ -1,4 +1,18 @@ - name: Install docker packages (yum) yum: state: present - name: docker,docker-registry,python-docker-py,nmap-ncat + name: docker-io,docker-registry,python-docker-py + +- name: Install netcat + yum: + state: present + name: nmap-ncat + # RHEL7 as well... + when: ansible_distribution == 'Fedora' + +- name: Install netcat + yum: + state: present + name: nc + when: ansible_distribution != 'Fedora' + diff --git a/test/integration/roles/test_docker/tasks/main.yml b/test/integration/roles/test_docker/tasks/main.yml index d1cd7f4e59..d0abc5a9c6 100644 --- a/test/integration/roles/test_docker/tasks/main.yml +++ b/test/integration/roles/test_docker/tasks/main.yml @@ -1,8 +1,9 @@ - include: docker-setup-rht.yml when: ansible_distribution in ['Fedora'] - # Packages on RHEL and CentOS are broken, broken, broken. Revisit when +- include: docker-setup-rht.yml + # Packages on RHEL and CentOS 7 are broken, broken, broken. Revisit when # they've got that sorted out - #when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS'] + when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_lsb.major_release|int == 6 # python-docker isn't available until 14.10. Revist at the next Ubuntu LTS #- include: docker-setup-debian.yml @@ -12,3 +13,5 @@ # Add other distributions as the proper packages become available when: ansible_distribution in ['Fedora'] +- include: docker-tests.yml + when: ansible_distribution in ['RedHat', 'CentOS'] and ansible_lsb.major_release|int == 6