Skip to content

Commit 36ad306

Browse files
Merge pull request #1113 from kuiwang02/initial
OCPQE-29415:add testing framework based on OTE and the first tests-private case
2 parents 44c9931 + c126c41 commit 36ad306

File tree

6,915 files changed

+2011302
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,915 files changed

+2011302
-24
lines changed
Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
[
22
{
33
"name": "[sig-operator][Jira:OLM] OLMv0 should pass a trivial sanity check",
4-
"labels": {},
4+
"labels": {
5+
"Extended": {},
6+
"ReleaseGate": {}
7+
},
58
"resources": {
69
"isolation": {}
710
},
811
"source": "openshift:payload:olmv0",
912
"lifecycle": "blocking",
1013
"environmentSelector": {}
14+
},
15+
{
16+
"name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:22259-[Skipped:Disconnected]marketplace operator CR status on a running cluster[Serial]",
17+
"labels": {
18+
"Extended": {},
19+
"NonHyperShiftHOST": {}
20+
},
21+
"resources": {
22+
"isolation": {}
23+
},
24+
"source": "openshift:payload:olmv0",
25+
"lifecycle": "informing",
26+
"environmentSelector": {
27+
"exclude": "topology==\"External\""
28+
}
1129
}
1230
]

tests-extension/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ vet: #HELP Run go vet against code.
5858

5959
.PHONY: lint
6060
lint: $(GOLANGCI_LINT) #HELP Run golangci linter.
61-
$(GOLANGCI_LINT) run
61+
$(GOLANGCI_LINT) run ./test/... ./cmd/...
62+
# exclude the bindata
6263

6364
.PHONY: fix-lint
6465
fix-lint: $(GOLANGCI_LINT) #HELP Fix lint issues

tests-extension/cmd/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121

2222
_ "github.com/openshift/operator-framework-olm/tests-extension/test/qe/specs"
23+
exutil "github.com/openshift/operator-framework-olm/tests-extension/test/qe/util"
2324
)
2425

2526
func main() {
@@ -168,7 +169,7 @@ func main() {
168169
}
169170

170171
// Automatically identify and label extended tests: select all tests from the specs directory and add the "Extended" label
171-
// specs.Select(exutil.Olmv1QeTestsOnly()).AddLabel("Extended") // uncomment it when initing the framekwork
172+
specs.Select(exutil.Olmv1QeTestsOnly()).AddLabel("Extended")
172173
// Process all test specs to apply extended-specific transformations and topology exclusions
173174
specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
174175
if spec.Labels.Has("Extended") {
@@ -234,7 +235,7 @@ func main() {
234235

235236
// Initialize the environment before running any tests.
236237
specs.AddBeforeAll(func() {
237-
// exutil.InitClusterEnv() // uncomment it when initing the framekwork
238+
exutil.InitClusterEnv()
238239
})
239240

240241
ext.AddSpecs(specs)

tests-extension/go.mod

Lines changed: 149 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,182 @@ module github.com/openshift/operator-framework-olm/tests-extension
33
go 1.24.3
44

55
require (
6+
github.com/blang/semver/v4 v4.0.0
7+
github.com/ghodss/yaml v1.0.0
8+
github.com/mattn/go-sqlite3 v1.14.32
69
github.com/onsi/ginkgo/v2 v2.23.3
710
github.com/onsi/gomega v1.37.0
811
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9
12+
github.com/openshift/api v0.0.0-20250808142411-c974eeafe3f1
13+
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
14+
github.com/pborman/uuid v1.2.1
915
github.com/spf13/cobra v1.9.1
16+
github.com/tidwall/gjson v1.18.0
17+
github.com/tidwall/pretty v1.2.1
18+
golang.org/x/oauth2 v0.30.0
19+
gopkg.in/yaml.v3 v3.0.1
20+
k8s.io/api v0.33.2
21+
k8s.io/apiextensions-apiserver v0.33.2
22+
k8s.io/apimachinery v0.33.3
23+
k8s.io/apiserver v0.33.2
24+
k8s.io/client-go v0.33.2
25+
k8s.io/kubernetes v1.32.3
1026
)
1127

1228
require (
1329
cel.dev/expr v0.24.0 // indirect
30+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
31+
github.com/Microsoft/go-winio v0.6.2 // indirect
1432
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
33+
github.com/beorn7/perks v1.0.1 // indirect
34+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36+
github.com/containerd/containerd/api v1.8.0 // indirect
37+
github.com/containerd/errdefs v1.0.0 // indirect
38+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
39+
github.com/containerd/log v0.1.0 // indirect
40+
github.com/containerd/ttrpc v1.2.7 // indirect
41+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
42+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
43+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
44+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
45+
github.com/distribution/reference v0.6.0 // indirect
46+
github.com/docker/docker v28.3.3+incompatible // indirect
47+
github.com/docker/go-units v0.5.0 // indirect
48+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
49+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
50+
github.com/felixge/httpsnoop v1.0.4 // indirect
51+
github.com/fsnotify/fsnotify v1.9.0 // indirect
52+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
1553
github.com/go-logr/logr v1.4.3 // indirect
54+
github.com/go-logr/stdr v1.2.2 // indirect
55+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
56+
github.com/go-openapi/jsonreference v0.21.0 // indirect
57+
github.com/go-openapi/swag v0.23.1 // indirect
1658
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
59+
github.com/godbus/dbus/v5 v5.1.0 // indirect
60+
github.com/gogo/protobuf v1.3.2 // indirect
61+
github.com/google/cadvisor v0.52.1 // indirect
1762
github.com/google/cel-go v0.25.0 // indirect
63+
github.com/google/gnostic-models v0.6.9 // indirect
1864
github.com/google/go-cmp v0.7.0 // indirect
1965
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
66+
github.com/google/uuid v1.6.0 // indirect
67+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
68+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
2069
github.com/inconshreveable/mousetrap v1.1.0 // indirect
21-
github.com/kr/pretty v0.3.1 // indirect
70+
github.com/josharian/intern v1.0.0 // indirect
71+
github.com/json-iterator/go v1.1.12 // indirect
72+
github.com/karrick/godirwalk v1.17.0 // indirect
73+
github.com/kylelemons/godebug v1.1.0 // indirect
74+
github.com/mailru/easyjson v0.9.0 // indirect
75+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
76+
github.com/moby/spdystream v0.5.0 // indirect
77+
github.com/moby/sys/mountinfo v0.7.2 // indirect
78+
github.com/moby/sys/userns v0.1.0 // indirect
79+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
80+
github.com/modern-go/reflect2 v1.0.2 // indirect
81+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
82+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
83+
github.com/opencontainers/cgroups v0.0.1 // indirect
84+
github.com/opencontainers/go-digest v1.0.0 // indirect
85+
github.com/opencontainers/image-spec v1.1.1 // indirect
86+
github.com/opencontainers/runc v1.2.5 // indirect
87+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
88+
github.com/opencontainers/selinux v1.11.1 // indirect
2289
github.com/pkg/errors v0.9.1 // indirect
90+
github.com/prometheus/client_golang v1.23.0 // indirect
91+
github.com/prometheus/client_model v0.6.2 // indirect
92+
github.com/prometheus/common v0.65.0 // indirect
93+
github.com/prometheus/procfs v0.16.1 // indirect
2394
github.com/rogpeppe/go-internal v1.14.1 // indirect
95+
github.com/sirupsen/logrus v1.9.3 // indirect
2496
github.com/spf13/pflag v1.0.6 // indirect
2597
github.com/stoewer/go-strcase v1.3.0 // indirect
26-
github.com/stretchr/testify v1.10.0 // indirect
98+
github.com/tidwall/match v1.1.1 // indirect
99+
github.com/x448/float16 v0.8.4 // indirect
100+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
101+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
102+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
103+
go.opentelemetry.io/otel v1.36.0 // indirect
104+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
109+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
110+
golang.org/x/crypto v0.41.0 // indirect
27111
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 // indirect
28112
golang.org/x/net v0.43.0 // indirect
113+
golang.org/x/sync v0.16.0 // indirect
29114
golang.org/x/sys v0.35.0 // indirect
115+
golang.org/x/term v0.34.0 // indirect
30116
golang.org/x/text v0.28.0 // indirect
117+
golang.org/x/time v0.12.0 // indirect
31118
golang.org/x/tools v0.35.0 // indirect
32119
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
33120
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
121+
google.golang.org/grpc v1.74.2 // indirect
34122
google.golang.org/protobuf v1.36.7 // indirect
35-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
36-
gopkg.in/yaml.v3 v3.0.1 // indirect
123+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
124+
gopkg.in/inf.v0 v0.9.1 // indirect
125+
gopkg.in/yaml.v2 v2.4.0 // indirect
126+
k8s.io/cloud-provider v0.0.0 // indirect
127+
k8s.io/component-base v0.33.2 // indirect
128+
k8s.io/component-helpers v0.32.3 // indirect
129+
k8s.io/controller-manager v0.32.3 // indirect
130+
k8s.io/cri-api v0.0.0 // indirect
131+
k8s.io/cri-client v0.0.0 // indirect
132+
k8s.io/csi-translation-lib v0.0.0 // indirect
133+
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
134+
k8s.io/klog/v2 v2.130.1 // indirect
135+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
136+
k8s.io/kube-scheduler v0.0.0 // indirect
137+
k8s.io/kubectl v0.32.3 // indirect
138+
k8s.io/kubelet v0.0.0 // indirect
139+
k8s.io/mount-utils v0.0.0 // indirect
140+
k8s.io/pod-security-admission v0.0.0 // indirect
141+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
142+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
143+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
144+
sigs.k8s.io/randfill v1.0.0 // indirect
145+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
146+
sigs.k8s.io/yaml v1.4.0 // indirect
37147
)
38148

39149
// This replace replace is required for we use the OCP fork of Ginkgo.
40-
replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54
150+
replace (
151+
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54
152+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
153+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250906192346-6efb6a95323f
154+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250906192346-6efb6a95323f
155+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250906192346-6efb6a95323f
156+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250906192346-6efb6a95323f
157+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250906192346-6efb6a95323f
158+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250906192346-6efb6a95323f
159+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250906192346-6efb6a95323f
160+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250906192346-6efb6a95323f
161+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250906192346-6efb6a95323f
162+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250906192346-6efb6a95323f
163+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250906192346-6efb6a95323f
164+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250906192346-6efb6a95323f
165+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250906192346-6efb6a95323f
166+
k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250906192346-6efb6a95323f
167+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250906192346-6efb6a95323f
168+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250906192346-6efb6a95323f
169+
k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250906192346-6efb6a95323f
170+
k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250906192346-6efb6a95323f
171+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250906192346-6efb6a95323f
172+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250906192346-6efb6a95323f
173+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250906192346-6efb6a95323f
174+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250906192346-6efb6a95323f
175+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250906192346-6efb6a95323f
176+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250906192346-6efb6a95323f
177+
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20250906192346-6efb6a95323f
178+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250906192346-6efb6a95323f
179+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250906192346-6efb6a95323f
180+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250906192346-6efb6a95323f
181+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250906192346-6efb6a95323f
182+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250906192346-6efb6a95323f
183+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250906192346-6efb6a95323f
184+
)

0 commit comments

Comments
 (0)