From 669fde25ec2fc0b36042156fc87d353eb0859465 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Mon, 24 Dec 2018 00:18:05 -0500
Subject: [PATCH] Make correct CLI image available for tests and check in e2e

---
 images/cli/Dockerfile                    |  4 +++-
 images/cli/manifests/01_imagestream.yaml | 11 +++++++++++
 images/cli/manifests/image-references    |  8 ++++++++
 test/extended/util/framework.go          |  9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 images/cli/manifests/01_imagestream.yaml
 create mode 100644 images/cli/manifests/image-references

diff --git a/images/cli/Dockerfile b/images/cli/Dockerfile
index 24e4a86bc959..d6d5eaf32387 100644
--- a/images/cli/Dockerfile
+++ b/images/cli/Dockerfile
@@ -10,7 +10,9 @@ RUN INSTALL_PKGS="origin-clients" && \
     yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
     rpm -V ${INSTALL_PKGS} && \
     yum clean all
+COPY manifests /manifests
 
 LABEL io.k8s.display-name="OpenShift Client" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
-      io.openshift.tags="openshift,cli"
+      io.openshift.tags="openshift,cli" \
+      io.openshift.release.operator="true"
diff --git a/images/cli/manifests/01_imagestream.yaml b/images/cli/manifests/01_imagestream.yaml
new file mode 100644
index 000000000000..0eb62af65f39
--- /dev/null
+++ b/images/cli/manifests/01_imagestream.yaml
@@ -0,0 +1,11 @@
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+  namespace: openshift
+  name: cli
+spec:
+  tags:
+  - name: latest
+    from:
+      kind: DockerImage
+      name: docker.io/openshift/origin-cli:v4.0
diff --git a/images/cli/manifests/image-references b/images/cli/manifests/image-references
new file mode 100644
index 000000000000..297f90912d5b
--- /dev/null
+++ b/images/cli/manifests/image-references
@@ -0,0 +1,8 @@
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+spec:
+  tags:
+  - name: cli
+    from:
+      kind: DockerImage
+      name: docker.io/openshift/origin-cli:v4.0
diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
index bb9b6a195f52..2cfc455cdb74 100644
--- a/test/extended/util/framework.go
+++ b/test/extended/util/framework.go
@@ -1482,6 +1482,15 @@ func GetRouterPodTemplate(oc *CLI) (*corev1.PodTemplateSpec, string, error) {
 }
 
 func FindImageFormatString(oc *CLI) (string, bool) {
+	// look up image stream
+	is, err := oc.AdminImageClient().ImageV1().ImageStreams("openshift").Get("cli", metav1.GetOptions{})
+	if err == nil {
+		for _, tag := range is.Spec.Tags {
+			if tag.Name == "latest" && tag.From != nil && tag.From.Kind == "DockerImage" {
+				return tag.From.Name, true
+			}
+		}
+	}
 	// the router is expected to be on all clusters
 	// TODO: switch this to read from the global config
 	template, _, err := GetRouterPodTemplate(oc)