From 22a18d271764a04eb1773f030824f4ac02d373b8 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 26 Apr 2018 01:37:57 -0400
Subject: [PATCH] Add an openshift/origin-tests image with the e2e suite

---
 hack/lib/constants.sh       |  4 +++-
 images/hypershift/.cccp.yml |  2 +-
 images/tests/.cccp.yml      |  1 +
 images/tests/Dockerfile     | 16 ++++++++++++++++
 images/tests/OWNERS         |  8 ++++++++
 images/tests/bin/.gitignore |  2 ++
 6 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 images/tests/.cccp.yml
 create mode 100644 images/tests/Dockerfile
 create mode 100644 images/tests/OWNERS
 create mode 100644 images/tests/bin/.gitignore

diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
index 580d0a495ad0..f3bf971648a5 100755
--- a/hack/lib/constants.sh
+++ b/hack/lib/constants.sh
@@ -326,6 +326,7 @@ readonly OS_ALL_IMAGES=(
   origin-egress-dns-proxy
   origin-recycler
   origin-template-service-broker
+  origin-tests
 )
 
 # os::build::images builds all images in this repo.
@@ -358,7 +359,8 @@ function os::build::images() {
   for i in `jobs -p`; do wait $i; done
 
   # images that depend on "${tag_prefix}-cli"
-  ( os::build::image "${tag_prefix}-control-plane"         images/origin ) &
+  ( os::build::image "${tag_prefix}-tests"         images/tests ) &
+  ( os::build::image "${tag_prefix}-control-plane" images/origin ) &
 
   for i in `jobs -p`; do wait $i; done
 
diff --git a/images/hypershift/.cccp.yml b/images/hypershift/.cccp.yml
index 61bf2c5f5f99..a997f43ee14e 100644
--- a/images/hypershift/.cccp.yml
+++ b/images/hypershift/.cccp.yml
@@ -1 +1 @@
-job-id: origin-hyperkube
+job-id: origin-hypershift
diff --git a/images/tests/.cccp.yml b/images/tests/.cccp.yml
new file mode 100644
index 000000000000..48ad8d0658d2
--- /dev/null
+++ b/images/tests/.cccp.yml
@@ -0,0 +1 @@
+job-id: origin-tests
diff --git a/images/tests/Dockerfile b/images/tests/Dockerfile
new file mode 100644
index 000000000000..df40dd5115e2
--- /dev/null
+++ b/images/tests/Dockerfile
@@ -0,0 +1,16 @@
+#
+# This is the official OpenShift test image. It can be used to verify
+# an installation of OpenShift completed successfully.
+#
+# The standard name for this image is openshift/origin-tests
+#
+FROM openshift/origin-cli
+
+RUN INSTALL_PKGS="origin-tests" && \
+    yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
+    yum clean all
+
+LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
+      io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
+      io.openshift.tags="openshift,tests,e2e"
diff --git a/images/tests/OWNERS b/images/tests/OWNERS
new file mode 100644
index 000000000000..ef253fe96db0
--- /dev/null
+++ b/images/tests/OWNERS
@@ -0,0 +1,8 @@
+reviewers:
+  - smarterclayton
+  - stevekuznetsov
+  - sdodson
+approvers:
+  - smarterclayton
+  - kargakis
+  - stevekuznetsov
diff --git a/images/tests/bin/.gitignore b/images/tests/bin/.gitignore
new file mode 100644
index 000000000000..d6b7ef32c847
--- /dev/null
+++ b/images/tests/bin/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore