Skip to content

Commit 03e8a77

Browse files
kuiwang02ci-robot
kuiwang02
authored and
ci-robot
committed
UPSTREAM: <carry>: enhance case to make it more stable
1 parent de243ef commit 03e8a77

File tree

3 files changed

+81
-56
lines changed

3 files changed

+81
-56
lines changed

‎openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
}
524524
},
525525
{
526-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
526+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:40m] [Serial][Disruptive][Slow]",
527527
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
528528
"labels": {
529529
"Extended": {},
@@ -540,7 +540,7 @@
540540
}
541541
},
542542
{
543-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
543+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:40m] [Serial][Disruptive][Slow]",
544544
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
545545
"labels": {
546546
"Extended": {},
@@ -608,7 +608,7 @@
608608
}
609609
},
610610
{
611-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
611+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:40m] [Serial][Disruptive][Slow]",
612612
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
613613
"labels": {
614614
"Extended": {},

‎openshift/tests-extension/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,15 @@ pkg/bindata/singleown/index/index.go: $(shell find testdata/singleown/index -typ
104104
go fmt ./$(@D)/...
105105

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

113+
.PHONY: FORCE
114+
FORCE:
115+
113116
# GO_COMPLIANCE_POLICY="exempt_all" must only be used for test related binaries.
114117
# It prevents various FIPS compliance policies from being applied to this compilation.
115118
# Do not set globally.

‎openshift/tests-extension/test/qe/specs/olmv1_ce.go‎

Lines changed: 74 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
166166
exutil.SkipForSNOCluster(oc)
167167
olmv1util.ValidateAccessEnvironment(oc)
168168
var (
169-
ns = "ns-68936"
170-
sa = "68936"
169+
caseID = "68936"
170+
ns = "ns-" + caseID
171+
sa = caseID
172+
labelValue = caseID
171173
baseDir = exutil.FixturePath("testdata", "olm")
172-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
173-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
174+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
175+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
174176
saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-clusterrole.yaml")
175177
saCrb = olmv1util.SaCLusterRolebindingDescription{
176178
Name: sa,
@@ -188,9 +190,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
188190
Template: saClusterRoleBindingOperandTemplate,
189191
}
190192
clustercatalog = olmv1util.ClusterCatalogDescription{
191-
Name: "clustercatalog-68936",
192-
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936",
193-
Template: clustercatalogTemplate,
193+
Name: "clustercatalog-68936",
194+
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936",
195+
LabelValue: labelValue,
196+
Template: clustercatalogTemplate,
194197
}
195198
ceInsufficient = olmv1util.ClusterExtensionDescription{
196199
Name: "insufficient-68936",
@@ -199,6 +202,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
199202
Version: ">=0.0.1",
200203
InstallNamespace: ns,
201204
SaName: sa,
205+
LabelValue: labelValue,
202206
Template: clusterextensionTemplate,
203207
}
204208
)
@@ -235,11 +239,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
235239
exutil.SkipForSNOCluster(oc)
236240
olmv1util.ValidateAccessEnvironment(oc)
237241
var (
238-
ns = "ns-68937"
239-
sa = "68937"
242+
caseID = "68937"
243+
ns = "ns-" + caseID
244+
sa = caseID
245+
labelValue = caseID
240246
baseDir = exutil.FixturePath("testdata", "olm")
241-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
242-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
247+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
248+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
243249
saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-rbac.yaml")
244250
saCrb = olmv1util.SaCLusterRolebindingDescription{
245251
Name: sa,
@@ -257,9 +263,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
257263
Template: saClusterRoleBindingOperandTemplate,
258264
}
259265
clustercatalog = olmv1util.ClusterCatalogDescription{
260-
Name: "clustercatalog-68937",
261-
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937",
262-
Template: clustercatalogTemplate,
266+
Name: "clustercatalog-68937",
267+
Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937",
268+
LabelValue: labelValue,
269+
Template: clustercatalogTemplate,
263270
}
264271
ceInsufficient = olmv1util.ClusterExtensionDescription{
265272
Name: "insufficient-68937",
@@ -268,6 +275,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
268275
Version: ">=0.0.1",
269276
InstallNamespace: ns,
270277
SaName: sa,
278+
LabelValue: labelValue,
271279
Template: clusterextensionTemplate,
272280
}
273281
)
@@ -882,21 +890,24 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
882890
exutil.SkipForSNOCluster(oc)
883891
olmv1util.ValidateAccessEnvironment(oc)
884892
var (
885-
ns = "ns-74618"
886-
sa = "sa74618"
893+
caseID = "74618"
894+
ns = "ns-" + caseID
895+
sa = "sa" + caseID
896+
labelValue = caseID
887897
baseDir = exutil.FixturePath("testdata", "olm")
888-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
889-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
898+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
899+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
890900
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
891901
saCrb = olmv1util.SaCLusterRolebindingDescription{
892902
Name: sa,
893903
Namespace: ns,
894904
Template: saClusterRoleBindingTemplate,
895905
}
896906
clustercatalog = olmv1util.ClusterCatalogDescription{
897-
Name: "clustercatalog-74618",
898-
Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777",
899-
Template: clustercatalogTemplate,
907+
Name: "clustercatalog-74618",
908+
Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777",
909+
LabelValue: labelValue,
910+
Template: clustercatalogTemplate,
900911
}
901912
ceGVK = olmv1util.ClusterExtensionDescription{
902913
Name: "dep-gvk-32777",
@@ -905,6 +916,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
905916
Version: ">=0.0.1",
906917
InstallNamespace: ns,
907918
SaName: sa,
919+
LabelValue: labelValue,
908920
Template: clusterextensionTemplate,
909921
}
910922
cePKG = olmv1util.ClusterExtensionDescription{
@@ -915,6 +927,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
915927
InstallNamespace: ns,
916928
UpgradeConstraintPolicy: "SelfCertified",
917929
SaName: sa,
930+
LabelValue: labelValue,
918931
Template: clusterextensionTemplate,
919932
}
920933
ceCST = olmv1util.ClusterExtensionDescription{
@@ -924,6 +937,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
924937
Version: ">=0.0.1",
925938
InstallNamespace: ns,
926939
SaName: sa,
940+
LabelValue: labelValue,
927941
Template: clusterextensionTemplate,
928942
}
929943
ceWBH = olmv1util.ClusterExtensionDescription{
@@ -934,6 +948,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
934948
InstallNamespace: ns,
935949
UpgradeConstraintPolicy: "SelfCertified",
936950
SaName: sa,
951+
LabelValue: labelValue,
937952
Template: clusterextensionTemplate,
938953
}
939954
ceNAN = olmv1util.ClusterExtensionDescription{
@@ -943,6 +958,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
943958
Version: ">=0.0.1",
944959
InstallNamespace: ns,
945960
SaName: sa,
961+
LabelValue: labelValue,
946962
Template: clusterextensionTemplate,
947963
}
948964
)
@@ -1001,7 +1017,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
10011017

10021018
})
10031019

1004-
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() {
1020+
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() {
10051021
exutil.SkipForSNOCluster(oc)
10061022
var (
10071023
caseID = "76843"
@@ -1012,8 +1028,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
10121028
ceName = "ce-" + caseID
10131029
iscpName = "icsp-" + caseID
10141030
baseDir = exutil.FixturePath("testdata", "olm")
1015-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
1016-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
1031+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
1032+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
10171033
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
10181034
icspTemplate = filepath.Join(baseDir, "icsp-single-mirror.yaml")
10191035
icsp = olmv1util.IcspDescription{
@@ -1023,9 +1039,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
10231039
Template: icspTemplate,
10241040
}
10251041
clustercatalog = olmv1util.ClusterCatalogDescription{
1026-
Name: catalogName,
1027-
Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712",
1028-
Template: clustercatalogTemplate,
1042+
Name: catalogName,
1043+
Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712",
1044+
LabelValue: labelValue,
1045+
Template: clustercatalogTemplate,
10291046
}
10301047
saCrb = olmv1util.SaCLusterRolebindingDescription{
10311048
Name: sa,
@@ -1082,7 +1099,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
10821099

10831100
})
10841101

1085-
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() {
1102+
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() {
10861103
exutil.SkipOnProxyCluster(oc)
10871104
exutil.SkipForSNOCluster(oc)
10881105
var (
@@ -1094,8 +1111,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
10941111
ceName = "ce-" + caseID
10951112
itdmsName = "itdms-" + caseID
10961113
baseDir = exutil.FixturePath("testdata", "olm")
1097-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
1098-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
1114+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
1115+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
10991116
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
11001117
itdmsTemplate = filepath.Join(baseDir, "itdms-full-mirror.yaml")
11011118
itdms = olmv1util.ItdmsDescription{
@@ -1107,9 +1124,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
11071124
Template: itdmsTemplate,
11081125
}
11091126
clustercatalog = olmv1util.ClusterCatalogDescription{
1110-
Name: catalogName,
1111-
Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844",
1112-
Template: clustercatalogTemplate,
1127+
Name: catalogName,
1128+
Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844",
1129+
LabelValue: labelValue,
1130+
Template: clustercatalogTemplate,
11131131
}
11141132
saCrb = olmv1util.SaCLusterRolebindingDescription{
11151133
Name: sa,
@@ -1181,8 +1199,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
11811199
ceName = "ce-" + caseID
11821200
cipName = "cip-" + caseID
11831201
baseDir = exutil.FixturePath("testdata", "olm")
1184-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
1185-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
1202+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
1203+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
11861204
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
11871205
cipTemplate = filepath.Join(baseDir, "cip.yaml")
11881206
cip = olmv1util.CipDescription{
@@ -1194,14 +1212,16 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
11941212
Template: cipTemplate,
11951213
}
11961214
clustercatalog = olmv1util.ClusterCatalogDescription{
1197-
Name: catalogName,
1198-
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193",
1199-
Template: clustercatalogTemplate,
1215+
Name: catalogName,
1216+
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193",
1217+
LabelValue: labelValue,
1218+
Template: clustercatalogTemplate,
12001219
}
12011220
clustercatalog1 = olmv1util.ClusterCatalogDescription{
1202-
Name: catalog1Name,
1203-
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931",
1204-
Template: clustercatalogTemplate,
1221+
Name: catalog1Name,
1222+
Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931",
1223+
LabelValue: labelValue,
1224+
Template: clustercatalogTemplate,
12051225
}
12061226
saCrb = olmv1util.SaCLusterRolebindingDescription{
12071227
Name: sa,
@@ -1272,8 +1292,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
12721292
ceName = "ce-" + caseID
12731293
cipName = "cip-" + caseID
12741294
baseDir = exutil.FixturePath("testdata", "olm")
1275-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
1276-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
1295+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
1296+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
12771297
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
12781298
cipTemplate = filepath.Join(baseDir, "cip.yaml")
12791299
cip = olmv1util.CipDescription{
@@ -1286,9 +1306,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
12861306
Template: cipTemplate,
12871307
}
12881308
clustercatalog = olmv1util.ClusterCatalogDescription{
1289-
Name: catalogName,
1290-
Imageref: imageRef,
1291-
Template: clustercatalogTemplate,
1309+
Name: catalogName,
1310+
Imageref: imageRef,
1311+
LabelValue: labelValue,
1312+
Template: clustercatalogTemplate,
12921313
}
12931314
saCrb = olmv1util.SaCLusterRolebindingDescription{
12941315
Name: sa,
@@ -1348,13 +1369,14 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
13481369
catalogName = "clustercatalog-" + caseID
13491370
ceName = "ce-" + caseID
13501371
baseDir = exutil.FixturePath("testdata", "olm")
1351-
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml")
1352-
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml")
1372+
clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml")
1373+
clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml")
13531374
saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml")
13541375
clustercatalog = olmv1util.ClusterCatalogDescription{
1355-
Name: catalogName,
1356-
Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983",
1357-
Template: clustercatalogTemplate,
1376+
Name: catalogName,
1377+
Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983",
1378+
LabelValue: labelValue,
1379+
Template: clustercatalogTemplate,
13581380
}
13591381
saCrb = olmv1util.SaCLusterRolebindingDescription{
13601382
Name: sa,
@@ -1410,7 +1432,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
14101432

14111433
})
14121434

1413-
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() {
1435+
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() {
14141436
exutil.SkipForSNOCluster(oc)
14151437
var (
14161438
caseID = "76985"

0 commit comments

Comments
 (0)