Skip to content

Bug 1797788: add openshift-tests as a future delegation binary #24560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 8 commits into from
Mar 30, 2020
Merged

Bug 1797788: add openshift-tests as a future delegation binary #24560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f86082d
move existing openshift tests to openshift-tests-kubernetes
deads2k Jan 23, 2020
b41307a
add openshift-tests as a future delegation binary
deads2k Jan 23, 2020
551e25f
add openshift-tests-kubernetes image
deads2k Jan 23, 2020
5753b6e
build openshift-tests in one image to phase in new images
deads2k Jan 27, 2020
e66b34d
switch to looking up all test plugins
deads2k Feb 3, 2020
9be3013
fix etcd_storage_path test, clean up all crds
sallyom Feb 28, 2020
9dffdea
spelling exectuable/executable
sallyom Mar 11, 2020
42ca787
remove duplicate tests plugins from symlinks
sallyom Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
move existing openshift tests to openshift-tests-kubernetes
  • Loading branch information
@deads2k @sallyom
deads2k authored and sallyom committed Mar 30, 2020
commit f86082d9a6c520b025330721a1b5cff36a0c558d
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down
0 cmd/openshift-tests/csi.go → cmd/openshift-tests-kubernetes/csi.go
View file
Open in desktop
File renamed without changes.
0 cmd/openshift-tests/e2e.go → cmd/openshift-tests-kubernetes/e2e.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/openshift-tests/openshift-tests.go → ...-kubernetes/openshift-tests-kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 cmd/openshift-tests/provider.go → cmd/openshift-tests-kubernetes/provider.go
View file
Open in desktop
File renamed without changes.
0 cmd/openshift-tests/upgrade.go → cmd/openshift-tests-kubernetes/upgrade.go
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions images/tests-base/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 test@test.com && \
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"
5 changes: 5 additions & 0 deletions images/tests-base/OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
reviewers:
- smarterclayton
- sdodson
approvers:
- smarterclayton
8 changes: 4 additions & 4 deletions images/tests/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 test@test.com && \
Expand Down