Skip to content

Commit 456b2cb

Browse files
kuiwang02ci-robot
kuiwang02
authored and
ci-robot
committed
UPSTREAM: <carry>: Add [OTP] to migrated cases
1 parent e7a54cf commit 456b2cb

File tree

4 files changed

+103
-70
lines changed

4 files changed

+103
-70
lines changed

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

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[
22
{
3-
"name": "[sig-olmv1][Jira:OLM] clustercatalog PolarionID:69242-[Skipped:Disconnected]Catalogd deprecated package/bundlemetadata/catalogmetadata from clustercatalog CR",
3+
"name": "[sig-olmv1][Jira:OLM] clustercatalog PolarionID:69242-[OTP][Skipped:Disconnected]Catalogd deprecated package bundlemetadata catalogmetadata from clustercatalog CR",
4+
"originalName": "[sig-olmv1][Jira:OLM] clustercatalog PolarionID:69242-[Skipped:Disconnected]Catalogd deprecated package bundlemetadata catalogmetadata from clustercatalog CR",
45
"labels": {
56
"Extended": {},
6-
"NonHyperShiftHOST": {}
7+
"NonHyperShiftHOST": {},
8+
"original-name:[sig-olmv1][Jira:OLM] clustercatalog PolarionID:69242-[Skipped:Disconnected]Catalogd deprecated package bundlemetadata catalogmetadata from clustercatalog CR": {}
79
},
810
"resources": {
911
"isolation": {}
@@ -15,11 +17,13 @@
1517
}
1618
},
1719
{
18-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:83069-olmv1 static networkpolicy.",
20+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:83069-[OTP]olmv1 static networkpolicy.",
21+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:83069-olmv1 static networkpolicy.",
1922
"labels": {
2023
"Extended": {},
2124
"NonHyperShiftHOST": {},
22-
"ReleaseGate": {}
25+
"ReleaseGate": {},
26+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:83069-olmv1 static networkpolicy.": {}
2327
},
2428
"resources": {
2529
"isolation": {}
@@ -31,10 +35,12 @@
3135
}
3236
},
3337
{
34-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68936-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand",
38+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68936-[OTP][Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand",
39+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68936-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand",
3540
"labels": {
3641
"Extended": {},
37-
"NonHyperShiftHOST": {}
42+
"NonHyperShiftHOST": {},
43+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:68936-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand": {}
3844
},
3945
"resources": {
4046
"isolation": {}
@@ -46,10 +52,12 @@
4652
}
4753
},
4854
{
49-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68937-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand rbac object",
55+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68937-[OTP][Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand rbac object",
56+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:68937-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand rbac object",
5057
"labels": {
5158
"Extended": {},
52-
"NonHyperShiftHOST": {}
59+
"NonHyperShiftHOST": {},
60+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:68937-[Skipped:Disconnected]cluster extension can not be installed with insufficient permission sa for operand rbac object": {}
5361
},
5462
"resources": {
5563
"isolation": {}
@@ -61,11 +69,12 @@
6169
}
6270
},
6371
{
64-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75492-[Skipped:Disconnected]cluster extension can not be installed with wrong sa or insufficient permission sa",
72+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75492-[OTP][Level0][Skipped:Disconnected]cluster extension can not be installed with wrong sa or insufficient permission sa",
73+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75492-[Skipped:Disconnected]cluster extension can not be installed with wrong sa or insufficient permission sa",
6574
"labels": {
6675
"Extended": {},
67-
"LEVEL0": {},
68-
"NonHyperShiftHOST": {}
76+
"NonHyperShiftHOST": {},
77+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:75492-[Skipped:Disconnected]cluster extension can not be installed with wrong sa or insufficient permission sa": {}
6978
},
7079
"resources": {
7180
"isolation": {}
@@ -77,11 +86,12 @@
7786
}
7887
},
7988
{
80-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75493-[Skipped:Disconnected]cluster extension can be installed with enough permission sa",
89+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75493-[OTP][Level0][Skipped:Disconnected]cluster extension can be installed with enough permission sa",
90+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:75493-[Skipped:Disconnected]cluster extension can be installed with enough permission sa",
8191
"labels": {
8292
"Extended": {},
83-
"LEVEL0": {},
84-
"NonHyperShiftHOST": {}
93+
"NonHyperShiftHOST": {},
94+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:75493-[Skipped:Disconnected]cluster extension can be installed with enough permission sa": {}
8595
},
8696
"resources": {
8797
"isolation": {}
@@ -93,10 +103,12 @@
93103
}
94104
},
95105
{
96-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81538-[Skipped:Disconnected]preflight check on permission on allns mode",
106+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81538-[OTP][Skipped:Disconnected]preflight check on permission on allns mode",
107+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81538-[Skipped:Disconnected]preflight check on permission on allns mode",
97108
"labels": {
98109
"Extended": {},
99-
"NonHyperShiftHOST": {}
110+
"NonHyperShiftHOST": {},
111+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:81538-[Skipped:Disconnected]preflight check on permission on allns mode": {}
100112
},
101113
"resources": {
102114
"isolation": {}
@@ -108,10 +120,12 @@
108120
}
109121
},
110122
{
111-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81664-[Skipped:Disconnected]preflight check on permission on own ns mode",
123+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81664-[OTP][Skipped:Disconnected]preflight check on permission on own ns mode",
124+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81664-[Skipped:Disconnected]preflight check on permission on own ns mode",
112125
"labels": {
113126
"Extended": {},
114-
"NonHyperShiftHOST": {}
127+
"NonHyperShiftHOST": {},
128+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:81664-[Skipped:Disconnected]preflight check on permission on own ns mode": {}
115129
},
116130
"resources": {
117131
"isolation": {}
@@ -123,10 +137,12 @@
123137
}
124138
},
125139
{
126-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81696-[Skipped:Disconnected]preflight check on permission on single ns mode",
140+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81696-[OTP][Skipped:Disconnected]preflight check on permission on single ns mode",
141+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:81696-[Skipped:Disconnected]preflight check on permission on single ns mode",
127142
"labels": {
128143
"Extended": {},
129-
"NonHyperShiftHOST": {}
144+
"NonHyperShiftHOST": {},
145+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:81696-[Skipped:Disconnected]preflight check on permission on single ns mode": {}
130146
},
131147
"resources": {
132148
"isolation": {}
@@ -138,10 +154,12 @@
138154
}
139155
},
140156
{
141-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:74618-[Skipped:Disconnected]ClusterExtension supports simple registry vzero bundles only",
157+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:74618-[OTP][Skipped:Disconnected]ClusterExtension supports simple registry vzero bundles only",
158+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:74618-[Skipped:Disconnected]ClusterExtension supports simple registry vzero bundles only",
142159
"labels": {
143160
"Extended": {},
144-
"NonHyperShiftHOST": {}
161+
"NonHyperShiftHOST": {},
162+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:74618-[Skipped:Disconnected]ClusterExtension supports simple registry vzero bundles only": {}
145163
},
146164
"resources": {
147165
"isolation": {}
@@ -153,10 +171,12 @@
153171
}
154172
},
155173
{
156-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
174+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
175+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]",
157176
"labels": {
158177
"Extended": {},
159-
"NonHyperShiftHOST": {}
178+
"NonHyperShiftHOST": {},
179+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]": {}
160180
},
161181
"resources": {
162182
"isolation": {}
@@ -168,10 +188,12 @@
168188
}
169189
},
170190
{
171-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
191+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
192+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]",
172193
"labels": {
173194
"Extended": {},
174-
"NonHyperShiftHOST": {}
195+
"NonHyperShiftHOST": {},
196+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]": {}
175197
},
176198
"resources": {
177199
"isolation": {}
@@ -183,10 +205,12 @@
183205
}
184206
},
185207
{
186-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78193-[Skipped:Disconnected]Runtime validation of container images using sigstore signatures [Serial][Disruptive][Slow]",
208+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78193-[OTP][Skipped:Disconnected]Runtime validation of container images using sigstore signatures [Serial][Disruptive][Slow]",
209+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78193-[Skipped:Disconnected]Runtime validation of container images using sigstore signatures [Serial][Disruptive][Slow]",
187210
"labels": {
188211
"Extended": {},
189-
"NonHyperShiftHOST": {}
212+
"NonHyperShiftHOST": {},
213+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:78193-[Skipped:Disconnected]Runtime validation of container images using sigstore signatures [Serial][Disruptive][Slow]": {}
190214
},
191215
"resources": {
192216
"isolation": {}
@@ -198,10 +222,12 @@
198222
}
199223
},
200224
{
201-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78300-[Skipped:Disconnected]validation of container images using sigstore signatures with different policy [Serial][Disruptive][Slow]",
225+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78300-[OTP][Skipped:Disconnected]validation of container images using sigstore signatures with different policy [Serial][Disruptive][Slow]",
226+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:78300-[Skipped:Disconnected]validation of container images using sigstore signatures with different policy [Serial][Disruptive][Slow]",
202227
"labels": {
203228
"Extended": {},
204-
"NonHyperShiftHOST": {}
229+
"NonHyperShiftHOST": {},
230+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:78300-[Skipped:Disconnected]validation of container images using sigstore signatures with different policy [Serial][Disruptive][Slow]": {}
205231
},
206232
"resources": {
207233
"isolation": {}
@@ -213,10 +239,12 @@
213239
}
214240
},
215241
{
216-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76983-[Skipped:Disconnected]install index and bundle from private image[Slow]",
242+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76983-[OTP][Skipped:Disconnected]install index and bundle from private image[Slow]",
243+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76983-[Skipped:Disconnected]install index and bundle from private image[Slow]",
217244
"labels": {
218245
"Extended": {},
219-
"NonHyperShiftHOST": {}
246+
"NonHyperShiftHOST": {},
247+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76983-[Skipped:Disconnected]install index and bundle from private image[Slow]": {}
220248
},
221249
"resources": {
222250
"isolation": {}
@@ -228,10 +256,12 @@
228256
}
229257
},
230258
{
231-
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
259+
"name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
260+
"originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]",
232261
"labels": {
233262
"Extended": {},
234-
"NonHyperShiftHOST": {}
263+
"NonHyperShiftHOST": {},
264+
"original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]": {}
235265
},
236266
"resources": {
237267
"isolation": {}

‎openshift/tests-extension/test/qe/README.md‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ We need to identify all cases from tests-private among all cases, then mark whic
3636
g.It("xxxxxx", g.Label("ReleaseGate"), func() {
3737
```
3838
- This makes the case equivalent to origin cases for openshift-tests
39-
- Test framework automatically sets these cases without `ReleaseGate` as `Informing`
4039
- For the cases with `ReleaseGate` that need `Informing`, add:
4140
```go
4241
import oteg "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo"
@@ -161,6 +160,8 @@ We need to identify all cases from tests-private among all cases, then mark whic
161160
162161
## Test Case Migration Guide
163162
163+
**Required For all QE cases**: Do not use `&|!,()/` in case title
164+
164165
### A. Code Changes for Migrated Cases
165166
166167
All migrated test case code needs the following changes to run in the new test framework:
@@ -180,32 +181,33 @@ All migrated test case code needs the following changes to run in the new test f
180181
2. **Jira Component**: Add `[Jira:OLM]` in case title
181182
3. **OpenShift CI compatibility**: If you believe the case meets OpenShift CI requirements, add `ReleaseGate` label to Ginkgo
182183
- **Note**: Don't add `ReleaseGate` if case title contains `Disruptive` or `Slow`, or labels contain `StressTest`
184+
4. **Required For Migrated case from test-private**: Add `[OTP]` in case title
183185
184186
#### Optional Label for Migration and New
185-
4. **LEVEL0**: Use Ginkgo label `g.Label("LEVEL0")`
186-
5. **Author**: Deprecated
187-
6. **ConnectedOnly**: Add `[Skipped:Disconnected]` in title
188-
7. **DisconnectedOnly**: Add `[Skipped:Connected][Skipped:Proxy]` in title
189-
8. **Case ID**: change to `PolarionID:xxxxxx`
190-
9. **Importance**: Deprecated
191-
10. **NonPrerelease**: Deprecated
187+
1. **LEVEL0**: Use title label `[Level0]`
188+
2. **Author**: Deprecated
189+
3. **ConnectedOnly**: Add `[Skipped:Disconnected]` in title
190+
4. **DisconnectedOnly**: Add `[Skipped:Connected][Skipped:Proxy]` in title
191+
5. **Case ID**: change to `PolarionID:xxxxxx`
192+
6. **Importance**: Deprecated
193+
7. **NonPrerelease**: Deprecated
192194
- **Longduration**: Change to `[Slow]` in case title
193195
- **ChkUpg**: Not supported (openshift-tests upgrade differs from OpenShift QE)
194-
11. **VMonly**: Deprecated
195-
12. **Slow, Serial, Disruptive**: Preserved
196-
13. **DEPRECATED**: Deprecated, corresponding cases deprecated. Use `IgnoreObsoleteTests` for deprecation after addition
197-
14. **CPaasrunOnly, CPaasrunBoth, StagerunOnly, StagerunBoth, ProdrunOnly, ProdrunBoth**: Deprecated
198-
15. **StressTest**: Use Ginkgo label `g.Label("StressTest")`
199-
16. **NonHyperShiftHOST**: Use Ginkgo label `g.Label("NonHyperShiftHOST")` or use `IsHypershiftHostedCluster` judgment, then skip
200-
17. **HyperShiftMGMT**: Deprecated. For cases needing hypershift mgmt execution, use `g.Label("NonHyperShiftHOST")` and `ValidHypershiftAndGetGuestKubeConf` validation (to be provided when OLMv1 supports hypershift)
201-
18. **MicroShiftOnly**: Deprecated. For cases not supporting microshift, use `SkipMicroshift` judgment, then skip
202-
19. **ROSA**: Deprecated. Three ROSA job types:
196+
8. **VMonly**: Deprecated
197+
9. **Slow, Serial, Disruptive**: Preserved
198+
10. **DEPRECATED**: Deprecated, corresponding cases deprecated. Use `IgnoreObsoleteTests` for deprecation after addition
199+
11. **CPaasrunOnly, CPaasrunBoth, StagerunOnly, StagerunBoth, ProdrunOnly, ProdrunBoth**: Deprecated
200+
12. **StressTest**: Use Ginkgo label `g.Label("StressTest")`
201+
13. **NonHyperShiftHOST**: Use Ginkgo label `g.Label("NonHyperShiftHOST")` or use `IsHypershiftHostedCluster` judgment, then skip
202+
14. **HyperShiftMGMT**: Deprecated. For cases needing hypershift mgmt execution, use `g.Label("NonHyperShiftHOST")` and `ValidHypershiftAndGetGuestKubeConf` validation (to be provided when OLMv1 supports hypershift)
203+
15. **MicroShiftOnly**: Deprecated. For cases not supporting microshift, use `SkipMicroshift` judgment, then skip
204+
16. **ROSA**: Deprecated. Three ROSA job types:
203205
- `rosa-sts-ovn`: equivalent to OCP
204206
- `rosa-sts-hypershift-ovn`: equivalent to hypershift hosted
205207
- `rosa-classic-sts`: doesn't use openshift-tests
206-
20. **ARO**: Deprecated. All ARO jobs based on HCP are equivalent to hypershift hosted (don't actually use openshift-test)
207-
21. **OSD_CCS**: Deprecated. Only one job type: `osd-ccs-gcp` equivalent to OCP
208-
22. **Feature Gates**: Handle test cases based on their feature gate requirements:
208+
17. **ARO**: Deprecated. All ARO jobs based on HCP are equivalent to hypershift hosted (don't actually use openshift-test)
209+
18. **OSD_CCS**: Deprecated. Only one job type: `osd-ccs-gcp` equivalent to OCP
210+
19. **Feature Gates**: Handle test cases based on their feature gate requirements:
209211
210212
**Case 1: Test only runs when feature gate is enabled**
211213
- The test should not execute if the feature gate is disabled
@@ -223,6 +225,7 @@ All migrated test case code needs the following changes to run in the new test f
223225
- The test executes the same way regardless of feature gate status
224226
- Do NOT use `IsFeaturegateEnabled` check
225227
- Do NOT add `[OCPFeatureGate:xxxx]` label
228+
20. **Exclusive**: change to `Serial`
226229
227230
## Test Automation Code Requirements
228231

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clustercatalog", g.Label("NonHyperShif
2121
exutil.SkipNoOLMv1Core(oc)
2222
})
2323

24-
g.It("PolarionID:69242-[Skipped:Disconnected]Catalogd deprecated package/bundlemetadata/catalogmetadata from clustercatalog CR", func() {
24+
g.It("PolarionID:69242-[OTP][Skipped:Disconnected]Catalogd deprecated package bundlemetadata catalogmetadata from clustercatalog CR", g.Label("original-name:[sig-olmv1][Jira:OLM] clustercatalog PolarionID:69242-[Skipped:Disconnected]Catalogd deprecated package bundlemetadata catalogmetadata from clustercatalog CR"), func() {
2525
g.By("get the old related crd package/bundlemetadata/bundledeployment")
2626
crds, err := oc.WithoutNamespace().AsAdmin().Run("get").Args("crd").Output()
2727
o.Expect(err).NotTo(o.HaveOccurred())

0 commit comments

Comments
 (0)