Skip to content

[CNO] Setup OTE framework and migrate test cases from tests-private #3015

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

Open
anuragthehatter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CNO] Setup OTE framework and migrate test cases from tests-private #3015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
WORKDIR /go/src/github.com/openshift/cluster-network-operator
COPY . .
RUN hack/build-go.sh
RUN go mod vendor && hack/build-go.sh && make build-e2e-tests && gzip -9 test/bin/cluster-network-operator-tests-ext

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-operator /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-endpoints /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-target /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-network-operator/test/bin/cluster-network-operator-tests-ext.gz /usr/bin/cluster-network-operator-tests-ext.gz

COPY manifests /manifests
COPY bindata /bindata
Expand Down
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,9 @@ clean:
$(RM) cluster-network-operator cluster-network-check-endpoints cluster-network-check-target
.PHONY: clean

.PHONY: build-e2e-tests
build-e2e-tests:
@echo "Building cluster-network-operator-tests-ext binary..."
$(MAKE) -C test build

GO_TEST_PACKAGES :=./pkg/... ./cmd/...
52 changes: 49 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ require (
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
github.com/vishvananda/netlink v1.3.1
github.com/vishvananda/netns v0.0.5 // indirect
golang.org/x/net v0.51.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.35.2
Expand Down Expand Up @@ -100,12 +100,16 @@ require (
)

require (
github.com/onsi/ginkgo/v2 v2.28.1
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260521151256-b5a8f7ec8a38
github.com/openshift/api v0.0.0-20260320151444-324a1bcb9f55
github.com/openshift/client-go v0.0.0-20260320040014-4b5fc2cdad98
github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
github.com/openshift/machine-config-operator v0.0.1-0.20250724162154-ab14c8e2843b
k8s.io/apiextensions-apiserver v0.35.2
k8s.io/client-go v0.35.2
k8s.io/kubernetes v1.35.2
k8s.io/pod-security-admission v0.35.2
sigs.k8s.io/controller-tools v0.20.1
)

Expand All @@ -114,6 +118,7 @@ require (
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fatih/color v1.18.0 // indirect
Expand All @@ -131,16 +136,21 @@ require (
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.27.0 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/onsi/ginkgo/v2 v2.28.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
Comment thread
anuragthehatter marked this conversation as resolved.
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/stretchr/objx v0.5.3 // indirect
Expand All @@ -155,9 +165,45 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
k8s.io/apiserver v0.35.2 // indirect
k8s.io/component-helpers v0.35.2 // indirect
k8s.io/controller-manager v0.32.1 // indirect
k8s.io/gengo/v2 v2.0.0-20251215205346-5ee0d033ba5b // indirect
k8s.io/kms v0.35.2 // indirect
k8s.io/kube-aggregator v0.35.1 // indirect
k8s.io/kubectl v0.32.1 // indirect
k8s.io/kubelet v0.32.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
)

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20260303184444-1cc650aa0565
k8s.io/api => k8s.io/api v0.35.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.35.2
k8s.io/apimachinery => k8s.io/apimachinery v0.35.2
k8s.io/apiserver => k8s.io/apiserver v0.35.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.35.2
k8s.io/client-go => k8s.io/client-go v0.35.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.35.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.2
k8s.io/code-generator => k8s.io/code-generator v0.35.2
k8s.io/component-base => k8s.io/component-base v0.35.2
k8s.io/component-helpers => k8s.io/component-helpers v0.35.2
k8s.io/controller-manager => k8s.io/controller-manager v0.35.2
k8s.io/cri-api => k8s.io/cri-api v0.35.2
k8s.io/cri-client => k8s.io/cri-client v0.35.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.35.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.35.2
k8s.io/endpointslice => k8s.io/endpointslice v0.35.2
k8s.io/externaljwt => k8s.io/externaljwt v0.35.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.2
k8s.io/kubectl => k8s.io/kubectl v0.35.2
k8s.io/kubelet => k8s.io/kubelet v0.35.2
k8s.io/metrics => k8s.io/metrics v0.35.2
k8s.io/mount-utils => k8s.io/mount-utils v0.35.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.35.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.2
)
Loading