WIP OPRUN-4054: [OTE] add catalog tests from openshift/origin #419

camilamacedo86 · 2025-08-01T10:13:17Z

This commit migrates the olmv1_catalog set of tests from openshift/origin
to OTE as part the broad effort to migrate all tests.

openshift-ci · 2025-08-01T10:13:57Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: camilamacedo86
Once this PR has been reviewed and has the lgtm label, please assign tmshort for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

DOWNSTREAM_OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

camilamacedo86 · 2025-08-04T10:15:35Z

/retest-required

openshift-ci-robot · 2025-08-04T10:57:21Z

@camilamacedo86: This pull request references OPRUN-4054 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

Summary of Changes

This PR migrates the OLMv1 catalog tests from openshift/origin/test/extended/olm/olmv1-catalogd.go to the OpenShift Test Extension (OTE) framework. The new implementation replaces the use of the oc command-line interface with a Go-native, strongly-typed client, and leverages the OLM API directly for resource management.

The migration offers several key improvements:

Go-native API Interaction: Replaces oc command executions and manual JSON parsing with direct calls to the Kubernetes API using the controller-runtime client. This provides a more robust, type-safe, and efficient way to interact with cluster resources.

Programmatic Resource Management: Instead of relying on testdata YAML files, test resources like ClusterCatalog and Job objects are now created and managed programmatically using Go structs. This eliminates the need for temporary files and enhances test reliability.

Improved Polling and Assertions: Switches from manual polling loops (wait.PollUntilContextTimeout) and output parsing to declarative gomega.Eventually blocks. This makes the tests more readable and less fragile when verifying asynchronous state changes.

This change aligns the OLMv1 tests with modern Go testing practices, improves maintainability, and removes the dependency on the oc CLI for test execution.

Comparison of Methodologies

Feature Original Test (openshift/origin) New OTE Test (operator-controller/openshift)

Kubernetes Interaction oc CLI commands (oc get, oc apply) with manual JSON output parsing. Go client (controller-runtime) for direct, type-safe API calls.

Resource Creation Manually writing and applying YAML files from a testdata directory. Programmatic creation of Go structs (e.g., olmv1.ClusterCatalog).

Resource Cleanup Relies on AfterEach blocks with oc delete commands on temporary files. Uses ginkgo.DeferCleanup for a more robust and idiomatic cleanup mechanism.

Asynchronous State Checks wait.PollUntilContextTimeout function with manual logic to parse and check status conditions from oc output. gomega.Eventually with typed assertions against native Go objects.

Dependency Requires the oc CLI to be installed and available in the test environment. No dependency on external CLI tools. Relies solely on the Go test binary and a valid kubeconfig.

--- **Disclaimer:** This summary and comparison was generated by an AI assistant.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

This commit migrates the olmv1_catalog set of tests from openshift/origin to OTE as part the broad effort to migrate all tests. Assisted-by: Gemini

openshift-ci-robot · 2025-08-08T22:03:11Z

@camilamacedo86: This pull request references OPRUN-4054 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

In response to this:

This commit migrates the olmv1_catalog set of tests from openshift/origin
to OTE as part the broad effort to migrate all tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

camilamacedo86 · 2025-08-08T22:30:35Z