Skip to content

OCPQE-31296:enhance qe cases to make it more stable #604

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-bot merged 1 commit into from
Jan 16, 2026
+81 −56
Merged

OCPQE-31296:enhance qe cases to make it more stable #604

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
6 changes: 3 additions & 3 deletions openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
}
},
{
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:40m] [Serial][Disruptive][Slow]",
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
"labels": {
"Extended": {},
Expand All @@ -540,7 +540,7 @@
}
},
{
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:40m] [Serial][Disruptive][Slow]",
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
"labels": {
"Extended": {},
Expand Down Expand Up @@ -608,7 +608,7 @@
}
},
{
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:40m] [Serial][Disruptive][Slow]",
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
"labels": {
"Extended": {},
Expand Down
5 changes: 4 additions & 1 deletion openshift/tests-extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,15 @@ pkg/bindata/singleown/index/index.go: $(shell find testdata/singleown/index -typ
go fmt ./$(@D)/...

bindata: pkg/bindata/qe/bindata.go
pkg/bindata/qe/bindata.go: $(shell find test/qe/testdata -type f)
pkg/bindata/qe/bindata.go: FORCE
mkdir -p $(@D)
$(GO_BINDATA) -nocompress -nometadata \
-pkg testdata -o $@ -prefix "testextended" test/qe/testdata/...
gofmt -s -w $@

.PHONY: FORCE
FORCE:

# GO_COMPLIANCE_POLICY="exempt_all" must only be used for test related binaries.
# It prevents various FIPS compliance policies from being applied to this compilation.
# Do not set globally.
Expand Down
126 changes: 74 additions & 52 deletions openshift/tests-extension/test/qe/specs/olmv1_ce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
exutil.SkipForSNOCluster(oc)
olmv1util.ValidateAccessEnvironment(oc)
var (
ns = "ns-68936"
sa = "68936"
caseID = "68936"
ns = "ns-" + caseID
sa = caseID
labelValue = caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-clusterrole.yaml")
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand All @@ -188,9 +190,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: saClusterRoleBindingOperandTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: "clustercatalog-68936",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936",
Template: clustercatalogTemplate,
Name: "clustercatalog-68936",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
ceInsufficient = olmv1util.ClusterExtensionDescription{
Name: "insufficient-68936",
Expand All @@ -199,6 +202,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Version: ">=0.0.1",
InstallNamespace: ns,
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
)
Expand Down Expand Up @@ -235,11 +239,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
exutil.SkipForSNOCluster(oc)
olmv1util.ValidateAccessEnvironment(oc)
var (
ns = "ns-68937"
sa = "68937"
caseID = "68937"
ns = "ns-" + caseID
sa = caseID
labelValue = caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-rbac.yaml")
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand All @@ -257,9 +263,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: saClusterRoleBindingOperandTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: "clustercatalog-68937",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937",
Template: clustercatalogTemplate,
Name: "clustercatalog-68937",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
ceInsufficient = olmv1util.ClusterExtensionDescription{
Name: "insufficient-68937",
Expand All @@ -268,6 +275,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Version: ">=0.0.1",
InstallNamespace: ns,
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
)
Expand Down Expand Up @@ -882,21 +890,24 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
exutil.SkipForSNOCluster(oc)
olmv1util.ValidateAccessEnvironment(oc)
var (
ns = "ns-74618"
sa = "sa74618"
caseID = "74618"
ns = "ns-" + caseID
sa = "sa" + caseID
labelValue = caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Namespace: ns,
Template: saClusterRoleBindingTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: "clustercatalog-74618",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777",
Template: clustercatalogTemplate,
Name: "clustercatalog-74618",
Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
ceGVK = olmv1util.ClusterExtensionDescription{
Name: "dep-gvk-32777",
Expand All @@ -905,6 +916,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Version: ">=0.0.1",
InstallNamespace: ns,
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
cePKG = olmv1util.ClusterExtensionDescription{
Expand All @@ -915,6 +927,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
InstallNamespace: ns,
UpgradeConstraintPolicy: "SelfCertified",
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
ceCST = olmv1util.ClusterExtensionDescription{
Expand All @@ -924,6 +937,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Version: ">=0.0.1",
InstallNamespace: ns,
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
ceWBH = olmv1util.ClusterExtensionDescription{
Expand All @@ -934,6 +948,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
InstallNamespace: ns,
UpgradeConstraintPolicy: "SelfCertified",
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
ceNAN = olmv1util.ClusterExtensionDescription{
Expand All @@ -943,6 +958,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Version: ">=0.0.1",
InstallNamespace: ns,
SaName: sa,
LabelValue: labelValue,
Template: clusterextensionTemplate,
}
)
Expand Down Expand Up @@ -1001,7 +1017,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh

})

g.It("PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
g.It("PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
exutil.SkipForSNOCluster(oc)
var (
caseID = "76843"
Expand All @@ -1012,8 +1028,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
ceName = "ce-" + caseID
iscpName = "icsp-" + caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
icspTemplate = filepath.Join(baseDir, "icsp-single-mirror.yaml")
icsp = olmv1util.IcspDescription{
Expand All @@ -1023,9 +1039,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: icspTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: catalogName,
Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712",
Template: clustercatalogTemplate,
Name: catalogName,
Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand Down Expand Up @@ -1082,7 +1099,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh

})

g.It("PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
g.It("PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
exutil.SkipOnProxyCluster(oc)
exutil.SkipForSNOCluster(oc)
var (
Expand All @@ -1094,8 +1111,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
ceName = "ce-" + caseID
itdmsName = "itdms-" + caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
itdmsTemplate = filepath.Join(baseDir, "itdms-full-mirror.yaml")
itdms = olmv1util.ItdmsDescription{
Expand All @@ -1107,9 +1124,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: itdmsTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: catalogName,
Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844",
Template: clustercatalogTemplate,
Name: catalogName,
Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand Down Expand Up @@ -1181,8 +1199,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
ceName = "ce-" + caseID
cipName = "cip-" + caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
cipTemplate = filepath.Join(baseDir, "cip.yaml")
cip = olmv1util.CipDescription{
Expand All @@ -1194,14 +1212,16 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: cipTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: catalogName,
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193",
Template: clustercatalogTemplate,
Name: catalogName,
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
clustercatalog1 = olmv1util.ClusterCatalogDescription{
Name: catalog1Name,
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931",
Template: clustercatalogTemplate,
Name: catalog1Name,
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand Down Expand Up @@ -1272,8 +1292,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
ceName = "ce-" + caseID
cipName = "cip-" + caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
cipTemplate = filepath.Join(baseDir, "cip.yaml")
cip = olmv1util.CipDescription{
Expand All @@ -1286,9 +1306,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
Template: cipTemplate,
}
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: catalogName,
Imageref: imageRef,
Template: clustercatalogTemplate,
Name: catalogName,
Imageref: imageRef,
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand Down Expand Up @@ -1348,13 +1369,14 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
catalogName = "clustercatalog-" + caseID
ceName = "ce-" + caseID
baseDir = exutil.FixturePath("testdata", "olm")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
clustercatalog = olmv1util.ClusterCatalogDescription{
Name: catalogName,
Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983",
Template: clustercatalogTemplate,
Name: catalogName,
Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983",
LabelValue: labelValue,
Template: clustercatalogTemplate,
}
saCrb = olmv1util.SaCLusterRolebindingDescription{
Name: sa,
Expand Down Expand Up @@ -1410,7 +1432,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh

})

g.It("PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
g.It("PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]"), func() {
exutil.SkipForSNOCluster(oc)
var (
caseID = "76985"
Expand Down