move existing openshift tests to openshift-tests-kubernetes

Makefile

@@ -45,7 +45,7 @@ all build:
 #   make build-all
 build-all:
 	hack/build-go.sh
-	hack/build-go.sh cmd/openshift-tests
+	hack/build-go.sh cmd/openshift-tests cmd/openshift-tests-kubernetes
 .PHONY: build-all
 
 # Build the test binaries.
@@ -56,7 +56,7 @@ build-tests: build-extended-test
 .PHONY: build-tests
 
 build-extended-test:
-	hack/build-go.sh cmd/openshift-tests
+	hack/build-go.sh cmd/openshift-tests cmd/openshift-tests-kubernetes
 .PHONY: build-extended-test
 
 build-docs:

cmd/openshift-tests/openshift-tests.go → cmd/openshift-tests-kubernetes/openshift-tests-kubernetes.go

@@ -35,7 +35,7 @@ func main() {
 
 	root := &cobra.Command{
 		Long: templates.LongDesc(`
-		OpenShift Tests
+		OpenShift Tests for Kubernetes
 
 		This command verifies behavior of an OpenShift cluster by running remote tests against
 		the cluster API that exercise functionality. In general these tests may be disruptive

images/tests-base/Dockerfile.rhel

@@ -0,0 +1,16 @@
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+WORKDIR /go/src/github.com/openshift/origin
+COPY . .
+RUN make build WHAT=cmd/openshift-tests; \
+    mkdir -p /tmp/build; \
+    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-tests /tmp/build/openshift-tests
+
+FROM registry.svc.ci.openshift.org/ocp/4.2:cli
+COPY --from=builder /tmp/build/openshift-tests /usr/bin/
+RUN yum install --setopt=tsflags=nodocs -y git gzip util-linux && yum clean all && rm -rf /var/cache/yum/* && \
+    git config --system user.name test && \
+    git config --system user.email [email protected] && \
+    chmod g+w /etc/passwd
+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"

images/tests-base/OWNERS

@@ -0,0 +1,5 @@
+reviewers:
+  - smarterclayton
+  - sdodson
+approvers:
+  - smarterclayton

images/tests/Dockerfile.rhel

@@ -1,12 +1,12 @@
 FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
-RUN make build WHAT=cmd/openshift-tests; \
+RUN make build WHAT=cmd/openshift-tests-kubernetes; \
     mkdir -p /tmp/build; \
-    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-tests /tmp/build/openshift-tests
+    cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/openshift-tests-kubernetes /tmp/build/openshift-tests-kubernetes
 
-FROM registry.svc.ci.openshift.org/ocp/4.2:cli
-COPY --from=builder /tmp/build/openshift-tests /usr/bin/
+FROM registry.svc.ci.openshift.org/ocp/4.2:tests-base
+COPY --from=builder /tmp/build/openshift-tests-kubernetes /usr/bin/
 RUN yum install --setopt=tsflags=nodocs -y git gzip util-linux && yum clean all && rm -rf /var/cache/yum/* && \
     git config --system user.name test && \
     git config --system user.email [email protected] && \