Skip to content

Commit 22a18d2

Browse files
Add an openshift/origin-tests image with the e2e suite
1 parent bfe70a3 commit 22a18d2

File tree

6 files changed

+31
-2
lines changed

6 files changed

+31
-2
lines changed

hack/lib/constants.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ readonly OS_ALL_IMAGES=(
326326
origin-egress-dns-proxy
327327
origin-recycler
328328
origin-template-service-broker
329+
origin-tests
329330
)
330331

331332
# os::build::images builds all images in this repo.
@@ -358,7 +359,8 @@ function os::build::images() {
358359
for i in `jobs -p`; do wait $i; done
359360

360361
# images that depend on "${tag_prefix}-cli"
361-
( os::build::image "${tag_prefix}-control-plane" images/origin ) &
362+
( os::build::image "${tag_prefix}-tests" images/tests ) &
363+
( os::build::image "${tag_prefix}-control-plane" images/origin ) &
362364

363365
for i in `jobs -p`; do wait $i; done
364366

images/hypershift/.cccp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
job-id: origin-hyperkube
1+
job-id: origin-hypershift

images/tests/.cccp.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
job-id: origin-tests

images/tests/Dockerfile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# This is the official OpenShift test image. It can be used to verify
3+
# an installation of OpenShift completed successfully.
4+
#
5+
# The standard name for this image is openshift/origin-tests
6+
#
7+
FROM openshift/origin-cli
8+
9+
RUN INSTALL_PKGS="origin-tests" && \
10+
yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
11+
rpm -V ${INSTALL_PKGS} && \
12+
yum clean all
13+
14+
LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
15+
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
16+
io.openshift.tags="openshift,tests,e2e"

images/tests/OWNERS

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
reviewers:
2+
- smarterclayton
3+
- stevekuznetsov
4+
- sdodson
5+
approvers:
6+
- smarterclayton
7+
- kargakis
8+
- stevekuznetsov

images/tests/bin/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)