Skip to content

OCPQE-30679:migrate more cases from tests-private to make layout #1118

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
merged 1 commit into from
Sep 30, 2025
Merged

OCPQE-30679:migrate more cases from tests-private to make layout #1118

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
138 changes: 138 additions & 0 deletions tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
[
{
"name": "[sig-operator][Jira:OLM] OLMv0 within all namespace PolarionID:21418-PolarionID:25679-[Skipped:Disconnected]Cluster resource created and deleted correctly [Serial]",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 should pass a trivial sanity check",
"labels": {
Expand Down Expand Up @@ -26,5 +41,128 @@
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 should PolarionID:73695-[Skipped:Disconnected]PO is disable",
"labels": {
"Extended": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 optional should PolarionID:68679-[Skipped:Disconnected]catalogsource with invalid name is created",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMvo on hypershift mgmt ROSA-OSD_CCS-HyperShiftMGMT-ConnectedOnly-Author:kuiwang-Medium-45381-Support custom catalogs in hypershift",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:69867-[Skipped:Disconnected]deployed in microshift and install one operator with single mode.",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:69868-[Skipped:Disconnected]olm microshift install operator with all mode, muilt og error and delete one og to get it installed.",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift.",
"labels": {
"Extended": {},
"NonHyperShiftHOST": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {
"exclude": "topology==\"External\""
}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 with multi ns PolarionID:22226-[Skipped:Disconnected]the csv without support MultiNamespace fails for og with MultiNamespace",
"labels": {
"Extended": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:24870-[Skipped:Disconnected]can not create csv without operator group",
"labels": {
"Extended": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {}
},
{
"name": "[sig-operator][Jira:OLM] OLMv0 within a namespace PolarionID:37263-[Skipped:Disconnected][Skipped:Proxy]Subscription stays in UpgradePending but InstallPlan not installing [Slow]",
"labels": {
"Extended": {}
},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv0",
"lifecycle": "informing",
"environmentSelector": {}
}
]
58 changes: 56 additions & 2 deletions tests-extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,69 @@ TOOLS_BIN_DIR := $(CURDIR)/bin

#SECTION Development
.PHONY: verify #HELP To verify the code
verify: tidy fmt vet lint
verify:
@echo "Running verification checks..."
@errors=0; \
failed_steps=""; \
echo "1/4 Running 'make tidy'..."; \
if ! $(MAKE) tidy; then \
echo "ERROR: 'make tidy' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps tidy"; \
else \
echo "SUCCESS: 'make tidy' passed"; \
fi; \
echo ""; \
echo "2/4 Running 'make fmt'..."; \
if ! $(MAKE) fmt; then \
echo "ERROR: 'make fmt' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps fmt"; \
else \
echo "SUCCESS: 'make fmt' passed"; \
fi; \
echo ""; \
echo "3/4 Running 'make vet'..."; \
if ! $(MAKE) vet; then \
echo "ERROR: 'make vet' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps vet"; \
else \
echo "SUCCESS: 'make vet' passed"; \
fi; \
echo ""; \
echo "4/4 Running 'make lint'..."; \
if ! $(MAKE) lint; then \
echo "ERROR: 'make lint' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps lint"; \
else \
echo "SUCCESS: 'make lint' passed"; \
fi; \
echo ""; \
echo "Verification completed with $$errors error(s)"; \
if [ $$errors -gt 0 ]; then \
echo "FAILED: The following verification check(s) failed:$$failed_steps"; \
exit 1; \
else \
echo "SUCCESS: All verification checks passed"; \
fi

.PHONY: tidy #HELP Run go mod tidy.
tidy:
go mod tidy

.PHONY: fmt
fmt: #HELP Run go fmt against code.
go fmt ./...
@files=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/qe/*' -exec gofmt -l {} \;); \
if [ -n "$$files" ]; then \
echo "Files that need formatting:"; \
echo "$$files"; \
echo ""; \
echo "To fix formatting, run:"; \
echo " find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/qe/*' -exec gofmt -w {} \\;"; \
exit 1; \
fi

.PHONY: vet
vet: #HELP Run go vet against code.
Expand Down
21 changes: 20 additions & 1 deletion tests-extension/test/qe/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ All migrated test case code needs the following changes to run in the new test f
14. **CPaasrunOnly, CPaasrunBoth, StagerunOnly, StagerunBoth, ProdrunOnly, ProdrunBoth**: Deprecated
15. **StressTest**: Use Ginkgo label `g.Label("StressTest")`
16. **NonHyperShiftHOST**: Use Ginkgo label `g.Label("NonHyperShiftHOST")` or use `IsHypershiftHostedCluster` judgment, then skip
17. **HyperShiftMGMT**: Deprecated. For cases needing hypershift mgmt execution, use `g.Label("NonHyperShiftHOST")` and `ValidHypershiftAndGetGuestKubeConf` validation (to be provided when OLMv1 supports hypershift)
17. **HyperShiftMGMT**: Deprecated. For cases needing hypershift mgmt execution, use `g.Label("NonHyperShiftHOST")` and `ValidHypershiftAndGetGuestKubeConf` validation
18. **MicroShiftOnly**: Deprecated. For cases not supporting microshift, use `SkipMicroshift` judgment, then skip
19. **ROSA**: Deprecated. Three ROSA job types:
- `rosa-sts-ovn`: equivalent to OCP
Expand Down Expand Up @@ -366,6 +366,25 @@ Consider these requirements when writing and reviewing code:
/payload-aggregate periodic-ci-openshift-release-master-ci-<release version>-e2e-gcp-ovn-serial 5
```

## Test Case Migration Mapping

The following table shows the mapping between the original g.Describe blocks in `openshift-tests-private/test/extended/operators/olm.go` and the corresponding migrated spec files in this repository:

| Original g.Describe in olm.go | Mapped Spec File | Line in olm.go |
|-------------------------------|------------------|----------------|
| `[sig-operators] OLM optional` | `olmv0_defaultoption.go` | 34 |
| `[sig-operators] OLM should` | `olmv0_defaultoption.go` | 150 |
| `[sig-operators] OLM for an end user use` | `olmv0_common.go` | 5302 |
| `[sig-operators] OLM for an end user handle common object` | `olmv0_common.go` | 5349 |
| `[sig-operators] OLM for an end user handle within a namespace` | `olmv0_nonallns.go` | 5555 |
| `[sig-operators] OLM for an end user handle to support` | `olmv0_multins.go` | 11544 |
| `[sig-operators] OLM for an end user handle within all namespace` | `olmv0_allns.go` | 12657 |
| `[sig-operators] OLM on hypershift` | `olmv0_hypershiftmgmt.go` | 14814 |

### Notes:
- Each mapped spec file contains a comment indicating its relationship to the original olm.go g.Describe block
- Some spec files map to multiple g.Describe blocks (e.g., `olmv0_common.go` and `olmv0_defaultoption.go`)

## How to Keep Test Names Unique

OTE requires unique test names. If you want to modify a test name after merging, refer to the [Makefile implementation](https://github.com/openshift/operator-framework-operator-controller/blob/main/openshift/tests-extension/Makefile#L104) for proper modification procedures.
Loading