Put openshift dockerfiles in test/install

Move the location of the openshift dockerfiles and delete the old one.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1542
Approved by: mheon

5 files changed, 18 insertions, 32 deletions

diff --git a/Dockerfile.Fedora.openshift b/Dockerfile.Fedora.openshift
deleted file mode 100644
index adf7176a8..000000000
--- a/Dockerfile.Fedora.openshift
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM registry.fedoraproject.org/fedora:28
-
-# This Dockerfile is only for building libpod and running
-# validation and gofmt tests.
-
-RUN dnf -y install btrfs-progs-devel \
-              bzip2 \
-              findutils \
-              git \
-              glib2-devel \
-              glibc-static \
-              gnupg \
-              golang \
-              golang-github-cpuguy83-go-md2man \
-              gpgme-devel \
-              libassuan-devel \
-              libseccomp-devel \
-              libselinux-devel \
-              skopeo-containers \
-              make \
-              ostree-devel \
-              python \
-              python3-dateutil \
-              python3-psutil \
-              python3-pytoml \
-              python3-varlink \
-              golang-github-cpuguy83-go-md2man \
-              rpm-build \
-              slirp4netns \
-              iptables && dnf -y clean all
-
-ENV GOPATH=/go
diff --git a/test/install/.gitignore b/test/install/.gitignore
new file mode 100644
index 000000000..0a948f916
--- /dev/null
+++ b/test/install/.gitignore
@@ -0,0 +1 @@
+rpms/
\ No newline at end of file
diff --git a/test/install/Dockerfile.Centos b/test/install/Dockerfile.Centos
new file mode 100644
index 000000000..11f60029b
--- /dev/null
+++ b/test/install/Dockerfile.Centos
@@ -0,0 +1,3 @@
+FROM registry.centos.org/centos/centos:7
+
+RUN yum install -y rpms/noarch/* rpms/x86_64/*
\ No newline at end of file
diff --git a/test/install/Dockerfile.Fedora b/test/install/Dockerfile.Fedora
new file mode 100644
index 000000000..188e60328
--- /dev/null
+++ b/test/install/Dockerfile.Fedora
@@ -0,0 +1,3 @@
+FROM registry.fedoraproject.org/fedora:28
+
+RUN dnf install -y rpms/noarch/* rpms/x86_64/*
\ No newline at end of file
diff --git a/test/install/README.md b/test/install/README.md
new file mode 100644
index 000000000..21e5ab26d
--- /dev/null
+++ b/test/install/README.md
@@ -0,0 +1,11 @@
+# Installation Tests
+
+The Dockerfiles in this directory attempt to install the RPMs built from this
+repo into the target OS. Make the RPMs first with:
+
+```
+make -f .copr/Makefile srpm outdir=test/install/rpms
+make -f .copr/Makefile build_binary outdir=test/install/rpms
+```
+
+Then, run a container image build using the Dockerfiles in this directory.
\ No newline at end of file