Skip to content

Commit

Permalink
Add an openshift/origin-tests image with the e2e suite
Browse files Browse the repository at this point in the history
  • Loading branch information
smarterclayton committed Apr 27, 2018
1 parent a641784 commit a9db7bc
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 2 deletions.
4 changes: 3 additions & 1 deletion hack/lib/constants.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/hypershift/.cccp.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
job-id: origin-hyperkube
job-id: origin-hypershift
1 change: 1 addition & 0 deletions images/tests/.cccp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
job-id: origin-tests
16 changes: 16 additions & 0 deletions images/tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 8 additions & 0 deletions images/tests/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
reviewers:
- smarterclayton
- stevekuznetsov
- sdodson
approvers:
- smarterclayton
- kargakis
- stevekuznetsov
2 changes: 2 additions & 0 deletions images/tests/bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore

0 comments on commit a9db7bc

Please sign in to comment.