From c762892bb110f2872a203e36f807866fb4f76eec Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Sun, 10 Jul 2016 22:27:51 -0500 Subject: [PATCH] Fix broken CentOS tests; 'DistributionNotFound: jinja2'. --- tests/Dockerfile.centos-6 | 6 +----- tests/Dockerfile.centos-7 | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/Dockerfile.centos-6 b/tests/Dockerfile.centos-6 index 7df05ff..4a4e7b8 100644 --- a/tests/Dockerfile.centos-6 +++ b/tests/Dockerfile.centos-6 @@ -3,17 +3,13 @@ FROM centos:6 # Install Ansible RUN yum -y update; yum clean all; RUN yum -y install epel-release -RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel +RUN yum -y install git ansible sudo RUN yum clean all -RUN easy_install pip -RUN pip install ansible - # Disable requiretty RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers # Install Ansible inventory file -RUN mkdir - p /etc/ansible RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts CMD ["/usr/sbin/init"] diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7 index ded17f1..8aa0654 100644 --- a/tests/Dockerfile.centos-7 +++ b/tests/Dockerfile.centos-7 @@ -13,16 +13,14 @@ rm -f /lib/systemd/system/basic.target.wants/*; \ rm -f /lib/systemd/system/anaconda.target.wants/*; # Install Ansible -RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel +RUN yum -y install epel-release +RUN yum -y install git ansible sudo RUN yum clean all -RUN easy_install pip -RUN pip install ansible # Disable requiretty RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers # Install Ansible inventory file -RUN mkdir - p /etc/ansible RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts VOLUME ["/sys/fs/cgroup"]