Skip to content

OADP: migrate CI to OO_BUNDLE (FBC) + enable TechPreview for OLMv1/VolumeGroupSnapshot testing#79152

Closed
kaovilai wants to merge 1 commit into
openshift:mainfrom
kaovilai:oadp-migrate-oo-index-to-oo-bundle
Closed

OADP: migrate CI to OO_BUNDLE (FBC) + enable TechPreview for OLMv1/VolumeGroupSnapshot testing#79152
kaovilai wants to merge 1 commit into
openshift:mainfrom
kaovilai:oadp-migrate-oo-index-to-oo-bundle

Conversation

@kaovilai
Copy link
Copy Markdown
Member

@kaovilai kaovilai commented May 11, 2026

Summary

Migrate all oadp-operator variant CI configs from the deprecated index image path (OO_INDEX: ci-index + optional-operators-ci-aws) to the recommended operator-sdk bundle workflow (OO_BUNDLE + optional-operators-ci-operator-sdk-aws). Also removes EOL oadp-1.0 variant configs entirely.

Changes per config:

  • operator.bundles: add as: oadp-operator-bundle + skip_building_index: true
  • base_images: add cli-operator-sdk (required by operator-sdk workflow, not in OCP release payload)
  • dependencies: OO_INDEX: ci-indexOO_BUNDLE: oadp-operator-bundle
  • workflow: optional-operators-ci-awsoptional-operators-ci-operator-sdk-aws
  • env: replace OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES with OO_INSTALL_MODE: OwnNamespace

TechPreviewNoUpgrade for OCP 4.22+ configs (oadp-1.6, oadp-dev):

  • Added FEATURE_SET: TechPreviewNoUpgrade to all test env blocks targeting OCP 4.22+
  • OLMv1 testing: The NewOLMOwnSingleNamespace feature gate (TechPreview-only on all current OCP branches) is required for OLMv1 to support OwnNamespace install mode. Without it, OLMv1 rejects bundles that don't declare AllNamespaces. This enables CI testing of OLMv1 lifecycle tests (fresh install, OLMv0→OLMv1 migration)
  • Volume Group Snapshots: TechPreview also enables volume group snapshot support, allowing CI to exercise VolumeGroupSnapshot-based backup/restore paths in OADP e2e tests

Migrated configs (13 files):

  • oadp-1.3 (4.12, 4.13, 4.14, 4.15)
  • oadp-1.4 (4.18)
  • oadp-1.5 (4.19, 4.20)
  • oadp-1.6 (4.18, 4.22, 5.0)
  • oadp-dev (4.22, 4.23, 5.0)

Deleted configs (2 files):

  • oadp-1.0 (4.12, 4.14) — EOL, no longer needed

Why FBC migration:

Since OCP 4.11+, index images are file-based catalogs (FBC) which are incompatible with ci-operator's legacy index image building. Building index images is deprecated and will be removed from ci-operator. The recommended replacement is operator-sdk run bundle via the optional-operators-ci-operator-sdk-aws workflow, which works with both legacy and FBC index formats.

See also: Moving to File-Based Catalog

Unblocks: openshift/oadp-operator#2160

Note

Responses generated with Claude

Copilot AI review requested due to automatic review settings May 11, 2026 21:27
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 11, 2026

Walkthrough

Multiple OADP CI YAMLs were updated to build and publish a named bundle (oadp-operator-bundle with skip_building_index: true), switch e2e jobs to operator-sdk workflows, and change test install wiring to use OO_BUNDLE, OO_INSTALL_MODE: OwnNamespace, and OO_INSTALL_NAMESPACE: openshift-adp instead of index/channel/package variables.

Changes

Cohort / File(s) Summary
Bundle build additions
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml, ...-1.3__4.12.yaml, ...-1.3__4.13.yaml, ...-1.3__4.14.yaml, ...-1.3__4.15.yaml, ...-1.4__4.18.yaml, ...-1.5__4.19.yaml, ...-1.5__4.20.yaml, ...-1.6__4.18.yaml, ...-1.6__4.22.yaml, ...-1.6__5.0.yaml, ...-dev__4.22.yaml, ...-dev__4.23.yaml, ...-dev__5.0.yaml
Introduce a named bundle artifact oadp-operator-bundle (alias/as) built from build/Dockerfile.bundle and set skip_building_index: true where present.
Workflow selector changes
ci-operator/config/openshift/oadp-operator/*__*.yaml
E2E periodic and non-periodic jobs switched from workflow: optional-operators-ci-aws to workflow: optional-operators-ci-operator-sdk-aws (applies to AWS, KubeVirt, HCP, CLI periodic variants as present).
Test install env/deps updates
ci-operator/config/openshift/oadp-operator/*__*.yaml
Replaced index/channel/package/target-namespace inputs (OO_INDEX, OO_CHANNEL, OO_PACKAGE, OO_TARGET_NAMESPACES) with bundle-based inputs: OO_BUNDLE: oadp-operator-bundle, OO_INSTALL_MODE: OwnNamespace, OO_INSTALL_NAMESPACE: openshift-adp.
Per-version/job-specific adjustments
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.*__*.yaml, ...-dev__*.yaml
Per-OCP-version and dev variant files align bundle build, workflow, and env changes; some files also add or reshape periodic HCP/KubeVirt/CLI jobs to match operator-sdk pattern.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR contains only YAML CI configuration changes affecting ci-operator configs. No Ginkgo test definitions or test names are modified. Custom check for stable test names is not applicable.
Test Structure And Quality ✅ Passed This PR contains only YAML CI operator configuration changes for OADP operators, not Ginkgo test code. The custom check requesting review of Ginkgo test structure and quality is not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests added. All changes are to ci-operator YAML config files only (job setup, workflows, env vars). MicroShift test compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR only modifies YAML CI configuration files for oadp-operator. No new Ginkgo e2e tests are added. SNO compatibility checks apply only to new test code, which is absent.
Topology-Aware Scheduling Compatibility ✅ Passed This PR modifies only CI-operator configuration files, not deployment manifests or operator code. No scheduling constraints are introduced. Check not applicable.
Ote Binary Stdout Contract ✅ Passed Custom check not applicable. PR contains only YAML CI configuration changes with no Go source code, test binaries, or process-level code that could write to stdout.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR contains only CI config YAML changes, no new Ginkgo e2e tests. Check designed for test code additions, not CI infrastructure modifications.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The PR title accurately captures the main change: migrating OADP CI configuration from deprecated OO_INDEX to OO_BUNDLE (FBC) and mentions enabling TechPreview for OLMv1/VolumeGroupSnapshot testing.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from mpryc and mrnold May 11, 2026 21:28
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2026
@kaovilai
Copy link
Copy Markdown
Member Author

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kaovilai
Copy link
Copy Markdown
Member Author

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Migrates the OADP operator variant ci-operator configs from the deprecated index-image-based optional-operators workflow (OO_INDEX / optional-operators-ci-aws) to the operator-sdk bundle workflow (OO_BUNDLE / optional-operators-ci-operator-sdk-aws) to avoid upcoming ci-operator index build removal.

Changes:

  • Define a named operator bundle (as: oadp-operator-bundle) and set skip_building_index: true in each variant config.
  • Switch test dependencies from OO_INDEX: ci-index to OO_BUNDLE: oadp-operator-bundle.
  • Update workflows to optional-operators-ci-operator-sdk-aws and replace channel/package/target namespace env with OO_INSTALL_MODE: OwnNamespace.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file
File Description
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml Switch OADP dev 5.0 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml Switch OADP dev 4.23 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml Switch OADP dev 4.22 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml Switch OADP 1.6 5.0 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml Switch OADP 1.6 4.22 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml Switch OADP 1.6 4.18 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml Switch OADP 1.5 4.20 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml Switch OADP 1.5 4.19 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml Switch OADP 1.4 4.18 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml Switch OADP 1.3 4.15 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml Switch OADP 1.3 4.14 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml Switch OADP 1.3 4.13 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml Switch OADP 1.3 4.12 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml Switch OADP 1.0 4.14 CI to operator-sdk bundle workflow and bundle dependency.
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml Switch OADP 1.0 4.12 CI to operator-sdk bundle workflow and bundle dependency.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@kaovilai kaovilai changed the title feat: migrate OADP CI from deprecated OO_INDEX to OO_BUNDLE OADP: migrate CI from deprecated OO_INDEX to OO_BUNDLE (FBC) May 11, 2026
@weshayutin
Copy link
Copy Markdown
Contributor

@kaovilai can you just delete any oadp-1.0.x files, we don't need to update them. We only need OADP-1.3+

@kaovilai
Copy link
Copy Markdown
Member Author

its just for sanity.. :/

@weshayutin
Copy link
Copy Markdown
Contributor

nuke a few more old jobs I think iiuc

@kaovilai
Copy link
Copy Markdown
Member Author

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2026
@kaovilai
Copy link
Copy Markdown
Member Author

/retest

@kaovilai
Copy link
Copy Markdown
Member Author

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kaovilai
Copy link
Copy Markdown
Member Author

/retest

@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 12, 2026
@kaovilai
Copy link
Copy Markdown
Member Author

/pj-rehearse auto-ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

couldn't prepare candidate: couldn't rebase candidate onto fcce2b3a2b294f5dfd293cdad17b88ca35c70d7b due to conflicts
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@kaovilai kaovilai force-pushed the oadp-migrate-oo-index-to-oo-bundle branch from ad92ffb to d3b9037 Compare May 13, 2026 23:43
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 13, 2026
@kaovilai kaovilai changed the title OADP: migrate CI from deprecated OO_INDEX to OO_BUNDLE (FBC) OADP: migrate CI to OO_BUNDLE (FBC) + enable TechPreview for OLMv1/VolumeGroupSnapshot testing May 14, 2026
@kaovilai kaovilai force-pushed the oadp-migrate-oo-index-to-oo-bundle branch from d84cd4d to 42713c8 Compare May 14, 2026 00:31
Migrate all oadp-operator variant CI configs from deprecated index
image path to operator-sdk bundle workflow. Also removes EOL oadp-1.0
variant configs and enables TechPreview for OCP 4.22+ testing.

Changes per config:
- operator.bundles: add as: oadp-operator-bundle + skip_building_index
- base_images: add cli-operator-sdk (not in OCP release payload)
- dependencies: OO_INDEX: ci-index -> OO_BUNDLE: oadp-operator-bundle
- workflow: optional-operators-ci-aws -> optional-operators-ci-operator-sdk-aws
- env: replace OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES with
  OO_INSTALL_MODE: OwnNamespace

TechPreviewNoUpgrade (OCP 4.22+ configs only):
- Enables NewOLMOwnSingleNamespace gate for OLMv1 OwnNamespace support
- Enables VolumeGroupSnapshot-based backup/restore testing

Unblocks: openshift/oadp-operator#2160

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
@kaovilai kaovilai force-pushed the oadp-migrate-oo-index-to-oo-bundle branch from 02ac106 to 878dec1 Compare May 14, 2026 01:55
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@kaovilai: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-images openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.20-images openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-unit-test openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.18-images openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-images openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-5.0-images openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.6-unit-test openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-bundle-oadp-operator-bundle openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-cli-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-images openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.14-images openshift/oadp-operator presubmit Ci-operator config changed

A total of 80 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@kaovilai
Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.19-images pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.5-4.20-images pull-ci-openshift-oadp-operator-oadp-1.5-unit-test pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-4.18-images pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-4.22-images pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-1.6-5.0-images pull-ci-openshift-oadp-operator-oadp-1.6-unit-test pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-bundle-oadp-operator-bundle pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-cli-aws pull-ci-openshift-oadp-operator-oadp-dev-4.22-images pull-ci-openshift-oadp-operator-oadp-1.3-4.14-e2e-test-aws pull-ci-openshift-oadp-operator-oadp-1.3-4.14-images

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@kaovilai: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@kaovilai
Copy link
Copy Markdown
Member Author

Note on oadp-1.0 job files remaining

The oadp-1.0 variant configs (__4.12, __4.14) are deleted in this PR since OADP 1.0 is EOL. However, the oadp-1.0 generated job files (ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-{presubmits,postsubmits,periodics}.yaml) are intentionally kept.

Why: The default config ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml still exists (unit tests, image builds). ci-operator-prowgen regenerates job files for every config in ci-operator/config/, so deleting the job files causes make update (and CI's generated-config check) to recreate them, resulting in a perpetual diff.

To fully remove oadp-1.0 jobs, the default config openshift-oadp-operator-oadp-1.0.yaml would also need to be deleted — but that's a separate decision for the OADP team.

Note

Responses generated with Claude

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

@kaovilai: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/oadp-operator/oadp-1.6/4.22-ci-index c2dd560 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-index
ci/rehearse/openshift/oadp-operator/oadp-1.3/4.12-ci-index c2dd560 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-index
ci/rehearse/openshift/oadp-operator/oadp-dev/5.0-ci-index c2dd560 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-index
ci/rehearse/openshift/oadp-operator/oadp-dev/4.22-ci-index 36aa091 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-index
ci/rehearse/openshift/oadp-operator/oadp-1.0/4.12-ci-index 36aa091 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.0-4.12-ci-index
ci/rehearse/openshift/oadp-operator/oadp-1.4/4.18-ci-index c2dd560 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-index
ci/rehearse/openshift/oadp-operator/oadp-dev/5.0-e2e-test-cli-aws 50b6161 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-dev-5.0-e2e-test-cli-aws
ci/rehearse/periodic-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-aws-periodic 50b6161 link unknown /pj-rehearse periodic-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-aws-periodic
ci/rehearse/openshift/oadp-operator/oadp-dev/5.0-e2e-test-aws 50b6161 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-dev-5.0-e2e-test-aws
ci/rehearse/openshift/oadp-operator/oadp-1.3/4.12-e2e-test-aws 50b6161 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.3-4.12-e2e-test-aws
ci/rehearse/openshift/oadp-operator/oadp-1.6/4.22-e2e-test-aws 6db49e9 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-aws
ci/rehearse/openshift/oadp-operator/oadp-1.6/4.22-e2e-test-hcp-aws 6db49e9 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-hcp-aws
ci/rehearse/openshift/oadp-operator/oadp-1.6/4.22-e2e-test-kubevirt-aws 6db49e9 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-kubevirt-aws
ci/rehearse/openshift/oadp-operator/oadp-1.6/4.22-e2e-test-cli-aws 6db49e9 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-cli-aws
ci/rehearse/openshift/oadp-operator/oadp-dev/4.23-e2e-test-aws 6db49e9 link unknown /pj-rehearse pull-ci-openshift-oadp-operator-oadp-dev-4.23-e2e-test-aws

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Copy link
Copy Markdown
Member

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2026
Copy link
Copy Markdown
Contributor

@weshayutin weshayutin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so @kaovilai channel is no longer needed? maybe something you can explain later :)

@kaovilai
Copy link
Copy Markdown
Member Author

Depends on #79324 — fixes a bug where OO_INSTALL_MODE was never actually passed to operator-sdk run bundle (the variable self-referenced an empty string instead of reading the env var). Without that fix, OO_INSTALL_MODE: OwnNamespace set in this PR's configs is silently ignored.

Note

Responses generated with Claude

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Joeavaikath, kaovilai, shubham-pampattiwar, weshayutin

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@kaovilai
Copy link
Copy Markdown
Member Author

@weshayutin Correct — OO_CHANNEL (and OO_PACKAGE) are no longer needed because we switched from OLM Subscription-based install to operator-sdk run bundle.

Old flow (optional-operators-ci-aws): Creates a CatalogSource from the index image, then creates a Subscription targeting a specific channel and package. OLM resolves the bundle from the catalog.

New flow (optional-operators-ci-operator-sdk-aws): Runs operator-sdk run bundle <bundle-image> directly. This installs the exact bundle image CI just built — no catalog resolution, no channel, no package name needed. The bundle image IS the thing being installed.

Think of it as: old = "install package X from channel Y in catalog Z" vs new = "install this exact bundle image".

Note

Responses generated with Claude

@kaovilai
Copy link
Copy Markdown
Member Author

It has been advised by folks in the know to not even touch this piece of code called Operator SDK, so looking at alternatives at the moment.

@kaovilai
Copy link
Copy Markdown
Member Author

Note

Responses generated with Claude

FBC Catalog Dockerfile Research — for follow-up PRs

We're moving away from the operator-sdk approach in this PR. Instead, we'll add an FBC catalog Dockerfile to oadp-operator itself (issue #2203) and update the CI configs to use it. This comment captures what we learned so follow-up PRs don't have to re-discover it.

The Dockerfile

build/Dockerfile.catalog — takes BUNDLE_IMG as a build arg, uses opm render to generate FBC, serves via gRPC. Multi-stage build following the coraza-kubernetes-operator pattern.

Key detail: must set /etc/containers/policy.json with insecureAcceptAnything so opm render can pull bundle images from CI's internal registry without signature verification.

CI config changes needed (replaces this PR's approach)

For each variant config, the diff from current (not from this PR) would be:

# KEEP as-is:
operator:
  bundles:
  - as: oadp-operator-bundle           # add 'as' name
    dockerfile_path: build/Dockerfile.bundle
    skip_building_index: true           # add: don't build deprecated ci-index
  substitutions:
  - pullspec: quay.io/konveyor/oadp-operator:latest
    with: oadp-operator

# ADD to images stanza:
images:
- dockerfile_path: build/Dockerfile.catalog
  build_args:
  - name: BUNDLE_IMG
    value: pipeline:oadp-operator-bundle   # ⚠️ needs verification, see below
  to: oadp-operator-catalog

# CHANGE in each test's steps:
    dependencies:
      OO_INDEX: oadp-operator-catalog      # was: ci-index
    env:
      OO_CHANNEL: dev                      # KEEP (was removed in this PR)
      OO_INSTALL_NAMESPACE: openshift-adp  # KEEP
      OO_PACKAGE: oadp-operator            # KEEP (was removed in this PR)
      OO_TARGET_NAMESPACES: '!install'     # KEEP (was removed in this PR)
      FEATURE_SET: TechPreviewNoUpgrade    # KEEP from this PR (4.22+ only)
    workflow: optional-operators-ci-aws    # KEEP original (not operator-sdk variant)

# REMOVE (no longer needed):
# - base_images.cli-operator-sdk

Open question: build_args with pipeline image references

No operator in the openshift org currently uses build_args with pipeline: references for catalog building. The pipeline:oadp-operator-bundle syntax needs verification against ci-operator. If it doesn't resolve pipeline image references in build_args, alternatives:

  1. Custom CI step — a step script that resolves the bundle image ref and runs podman build --build-arg BUNDLE_IMG=$(oc registry info)/... -f build/Dockerfile.catalog
  2. Quay operator pattern — skip optional-operators-ci-aws entirely, use a custom step that creates CatalogSource directly (see ci-operator/step-registry/quay/install-quay-operator/)

Reference implementations

Operator Approach Link
coraza-kubernetes-operator ARG BUNDLE_IMGS + opm render in Dockerfile (closest to ours) catalog/Dockerfile
Quay operator Custom CI step script, creates CatalogSource from env var step-registry
OCS operator Uses deprecated ci-index auto-generation ci config

@kaovilai
Copy link
Copy Markdown
Member Author

Superseded by #79327 — same migration (FBC + TechPreview + oadp-1.0 deletion) but without operator-sdk dependency. Uses Dockerfile.catalog (opm render) + optional-operators-ci-aws workflow instead of operator-sdk run bundle + optional-operators-ci-operator-sdk-aws.

Depends on openshift/oadp-operator#2204 for build/Dockerfile.catalog.

Note

Responses generated with Claude

@kaovilai kaovilai closed this May 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants