From 4d94ef7588fa97776b5eec3345c3a7e7a5758ad9 Mon Sep 17 00:00:00 2001
From: Paul Montero <lpaulmp@gmail.com>
Date: Sat, 16 Sep 2017 15:00:29 -0500
Subject: [PATCH] Support centos6 and centos7

---
 .gitignore                            |  3 ++-
 tests/docker-compose.yml              | 16 ++++++++++++++++
 tests/dockerfiles/centos6/Dockerfile  | 11 +++++++++++
 tests/dockerfiles/centos7/Dockerfile  | 11 +++++++++++
 tests/dockerfiles/debian8/Dockerfile  | 20 ++++++++++----------
 tests/dockerfiles/debian9/Dockerfile  | 10 +++++-----
 tests/dockerfiles/ubuntu14/Dockerfile | 20 ++++++++++----------
 tests/dockerfiles/ubuntu16/Dockerfile |  6 +++---
 tests/inventory                       |  6 ++++++
 9 files changed, 74 insertions(+), 29 deletions(-)
 create mode 100644 tests/dockerfiles/centos6/Dockerfile
 create mode 100644 tests/dockerfiles/centos7/Dockerfile

diff --git a/.gitignore b/.gitignore
index fab7220..37d4c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 ._*
 .*.sw*
 *~
-.idea/
\ No newline at end of file
+.idea/
+*.retry
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index ff7eef8..3f71c4f 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -1,5 +1,13 @@
 version: "3"
 services:
+  centos6:
+    build: ./dockerfiles/centos6
+    cap_add:
+      - ALL
+  centos7:
+    build: ./dockerfiles/centos7
+    cap_add:
+      - ALL
   debian8:
     build: ./dockerfiles/debian8
     cap_add:
@@ -8,3 +16,11 @@ services:
     build: ./dockerfiles/debian9
     cap_add:
       - ALL
+  ubuntu14:
+    build: ./dockerfiles/ubuntu14
+    cap_add:
+      - ALL
+  ubuntu16:
+    build: ./dockerfiles/ubuntu16
+    cap_add:
+      - ALL
diff --git a/tests/dockerfiles/centos6/Dockerfile b/tests/dockerfiles/centos6/Dockerfile
new file mode 100644
index 0000000..1792c95
--- /dev/null
+++ b/tests/dockerfiles/centos6/Dockerfile
@@ -0,0 +1,11 @@
+FROM centos:6
+
+RUN useradd -ms /bin/bash user
+
+RUN yum update -y && \
+		yum install -y \
+			initscripts \
+			sudo \
+		&& yum clean all
+
+CMD ["/sbin/init"]
diff --git a/tests/dockerfiles/centos7/Dockerfile b/tests/dockerfiles/centos7/Dockerfile
new file mode 100644
index 0000000..4cc0792
--- /dev/null
+++ b/tests/dockerfiles/centos7/Dockerfile
@@ -0,0 +1,11 @@
+FROM centos:7
+
+RUN useradd -ms /bin/bash user
+
+RUN yum update -y && \
+    yum install -y \
+			sudo \
+			which \
+		&& yum clean all
+
+CMD ["/usr/sbin/init"]
diff --git a/tests/dockerfiles/debian8/Dockerfile b/tests/dockerfiles/debian8/Dockerfile
index abda47e..5ec183c 100644
--- a/tests/dockerfiles/debian8/Dockerfile
+++ b/tests/dockerfiles/debian8/Dockerfile
@@ -3,16 +3,16 @@ FROM debian:8
 RUN useradd -ms /bin/bash user
 
 RUN apt-get update && \
-    apt-get install -y \
-		curl \
-	  build-essential \
-		libbz2-dev \ 
-		libffi-dev \
-		libncurses5-dev \
-		libreadline-dev \ 
-		libssl-dev \ 
-		sudo \
-		wget \
+		apt-get install -y \
+			curl \
+			build-essential \
+			libbz2-dev \
+			libffi-dev \
+			libncurses5-dev \
+			libreadline-dev \
+			libssl-dev \
+			sudo \
+			wget \
 		&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/
diff --git a/tests/dockerfiles/debian9/Dockerfile b/tests/dockerfiles/debian9/Dockerfile
index 4c94901..4d43447 100644
--- a/tests/dockerfiles/debian9/Dockerfile
+++ b/tests/dockerfiles/debian9/Dockerfile
@@ -4,11 +4,11 @@ RUN useradd -ms /bin/bash user
 
 RUN apt-get update && \
     apt-get install -y \
-		curl \
-		gpg \
-		python \
-		sudo \
-		systemd \
+			curl \
+			gpg \
+			python \
+			sudo \
+			systemd \
 		&& rm -rf /var/lib/apt/lists/*
 
 CMD ["/bin/systemd"]
diff --git a/tests/dockerfiles/ubuntu14/Dockerfile b/tests/dockerfiles/ubuntu14/Dockerfile
index b1e04da..5cf3ba2 100644
--- a/tests/dockerfiles/ubuntu14/Dockerfile
+++ b/tests/dockerfiles/ubuntu14/Dockerfile
@@ -3,16 +3,16 @@ FROM ubuntu:14.04
 RUN useradd -ms /bin/bash user
 
 RUN apt-get update && \
-    apt-get install -y \
-		curl \
-	  build-essential \
-		libbz2-dev \
-		libffi-dev \
-		libncurses5-dev \
-		libreadline-dev \
-		libssl-dev \
-		sudo \
-		wget \
+		apt-get install -y \
+			curl \
+			build-essential \
+			libbz2-dev \
+			libffi-dev \
+			libncurses5-dev \
+			libreadline-dev \
+			libssl-dev \
+			sudo \
+			wget \
 		&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/
diff --git a/tests/dockerfiles/ubuntu16/Dockerfile b/tests/dockerfiles/ubuntu16/Dockerfile
index 2b637e3..10e923d 100644
--- a/tests/dockerfiles/ubuntu16/Dockerfile
+++ b/tests/dockerfiles/ubuntu16/Dockerfile
@@ -4,9 +4,9 @@ RUN useradd -ms /bin/bash user
 
 RUN apt-get update && \
     apt-get install -y \
-		curl \
-		python \
-		sudo \
+			curl \
+			python \
+			sudo \
 		&& rm -rf /var/lib/apt/lists/*
 
 CMD ["/sbin/init"]
diff --git a/tests/inventory b/tests/inventory
index a48fe29..02faca2 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,3 +1,9 @@
+[centos]
+tests_centos6_1 ansible_connection=docker
+tests_centos7_1 ansible_connection=docker
 [debian]
 tests_debian8_1 ansible_connection=docker
 tests_debian9_1 ansible_connection=docker
+[ubuntu]
+tests_ubuntu14_1 ansible_connection=docker
+tests_ubuntu16_1 ansible_connection=docker