From bf2d28506121c8a2077f0c96b0e5fdb6a52e03bf Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 1 May 2015 15:37:53 -0300
Subject: [PATCH] Get the docker test suite up and running again.

---
 hacking/runtests.sh                                  | 12 ++++++------
 .../Dockerfile                                       |  7 ++++---
 .../README.md                                        |  0
 .../Dockerfile                                       |  7 ++++---
 .../README.md                                        |  0
 5 files changed, 14 insertions(+), 12 deletions(-)
 rename hacking/{titotest-centos-5.9 => titotest-centos-5}/Dockerfile (85%)
 rename hacking/{titotest-centos-5.9 => titotest-centos-5}/README.md (100%)
 rename hacking/{titotest-centos-6.4 => titotest-centos-6}/Dockerfile (88%)
 rename hacking/{titotest-centos-6.4 => titotest-centos-6}/README.md (100%)

diff --git a/hacking/runtests.sh b/hacking/runtests.sh
index 6e4e864..236ce7e 100755
--- a/hacking/runtests.sh
+++ b/hacking/runtests.sh
@@ -59,16 +59,16 @@
 #                  |   |  |  |                    |                   |
 #     docker run --rm -i -t -v $PWD:/home/sandbox titotest-centos-5.9 /bin/bash
 
+#titotest-centos-5.9
+#titotest-fedora-20
+#titotest-fedora-rawhide
 distros='
-titotest-centos-5.9
-titotest-centos-6.4
-titotest-fedora-20
-titotest-fedora-rawhide
+titotest-centos-6
 '
 
+#titotest-fedora-20
+#titotest-fedora-rawhide
 python3_distros='
-titotest-fedora-20
-titotest-fedora-rawhide
 '
 
 rm -f /tmp/titotest*.out &> /dev/null
diff --git a/hacking/titotest-centos-5.9/Dockerfile b/hacking/titotest-centos-5/Dockerfile
similarity index 85%
rename from hacking/titotest-centos-5.9/Dockerfile
rename to hacking/titotest-centos-5/Dockerfile
index 32661af..c355532 100644
--- a/hacking/titotest-centos-5.9/Dockerfile
+++ b/hacking/titotest-centos-5/Dockerfile
@@ -1,5 +1,5 @@
 # https://index.docker.io/_/centos/
-FROM tianon/centos:5.9
+FROM centos:5
 
 # http://jumanjiman.github.io/
 MAINTAINER Paul Morgan <jumanjiman@gmail.com>
@@ -21,8 +21,9 @@ RUN pip-python install mock --upgrade
 RUN yum clean all
 
 RUN useradd sandbox
-RUN git config --global user.email "sandbox@example.com"
-RUN git config --global user.name  "sandbox"
+
+RUN git config --system user.email "sandbox@example.com"
+RUN git config --system user.name  "sandbox"
 
 USER sandbox
 VOLUME ["/home/sandbox"]
diff --git a/hacking/titotest-centos-5.9/README.md b/hacking/titotest-centos-5/README.md
similarity index 100%
rename from hacking/titotest-centos-5.9/README.md
rename to hacking/titotest-centos-5/README.md
diff --git a/hacking/titotest-centos-6.4/Dockerfile b/hacking/titotest-centos-6/Dockerfile
similarity index 88%
rename from hacking/titotest-centos-6.4/Dockerfile
rename to hacking/titotest-centos-6/Dockerfile
index d4b342b..127b928 100644
--- a/hacking/titotest-centos-6.4/Dockerfile
+++ b/hacking/titotest-centos-6/Dockerfile
@@ -1,5 +1,5 @@
 # https://index.docker.io/_/centos/
-FROM centos:6.4
+FROM centos:6
 
 # http://jumanjiman.github.io/
 MAINTAINER Paul Morgan <jumanjiman@gmail.com>
@@ -25,11 +25,12 @@ RUN yum -y install \
     python-mock \
     python-nose \
     python-pep8 \
+    tar \
     ; yum clean all
 
 RUN useradd sandbox
-RUN git config --global user.email "sandbox@example.com"
-RUN git config --global user.name  "sandbox"
+RUN git config --system user.email "sandbox@example.com"
+RUN git config --system user.name  "sandbox"
 
 USER sandbox
 VOLUME ["/home/sandbox"]
diff --git a/hacking/titotest-centos-6.4/README.md b/hacking/titotest-centos-6/README.md
similarity index 100%
rename from hacking/titotest-centos-6.4/README.md
rename to hacking/titotest-centos-6/README.md