Skip to content

Add CI image substitutions for OADP plugin images (base_images + operator.substitutions) - #82762

Open
kaovilai wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:oadp-plugin-image-substitutions
Open

Add CI image substitutions for OADP plugin images (base_images + operator.substitutions)#82762
kaovilai wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:oadp-plugin-image-substitutions

Conversation

@kaovilai

@kaovilai kaovilai commented Jul 31, 2026

Copy link
Copy Markdown
Member

Adds base_images + operator.substitutions entries so CI-built OADP plugin images get substituted into the operator bundle for e2e, across all currently-supported release branches.

Changes (10 files)

  • oadp-1.3 (4.14): openshift-velero-plugin, velero, velero-plugin-for-{aws,csi,gcp,microsoft-azure}
  • oadp-1.4 (4.18), oadp-1.5 (4.19, 4.20): same set, swapping csi for legacy-aws
  • oadp-1.6 (4.18, 4.22, 5.0): full 17-image set — adds hypershift-oadp-plugin, kubevirt-datamover-controller, kubevirt-datamover-plugin, kubevirt-velero-plugin, oadp-cli, oadp-must-gather, oadp-non-admin, oadp-vm-file-restore, oadp-vmdp, oadp-vmfr-access (+ -sshd), plus openshift-velero-plugin/velero/velero-plugin-for-{aws,gcp,legacy-aws,microsoft-azure}
  • oadp-dev (4.22, 4.23, 5.0): 14-image subset of the 1.6 set — excludes hypershift-oadp-plugin, kubevirt-velero-plugin, oadp-non-admin (no CI config exists for those on dev yet); oadp-vmfr-access-sshd also excluded (no CI repo builds it on dev)

Why

e2e currently only picks up a new plugin build via the hourly image-mirroring/promotion job. Wiring CI-built images directly into base_images/operator.substitutions means e2e will pick up a plugin change as soon as it merges — removing that hourly lag.

WITHOUT this PR                          WITH this PR
────────────────────────────             ────────────────────────────
Plugin repo merges                       Plugin repo merges
        │                                        │
        ▼                                        ▼
CI builds image                          CI builds image
        │                                        │
        ▼                                        ▼
Promotes to konveyor/*                   Promotes to konveyor/*
ImageStream                              ImageStream
        │                                        │
        ▼                                        │  (mirror still runs,
Mirror job copies to                             │   but e2e no longer
quay.io/konveyor                                 │   waits on it)
  ⏱ hours of delay                               │
        │                                        ▼
        ▼                                base_images + operator.substitutions
CSV hardcodes                            resolve straight off the CI
quay.io/konveyor/velero-*:oadp-1.6       ImageStream tag → @sha256 digest
        │                                        │
        ▼                                        ▼
OLM deploys stale quay.io tags           OLM deploys the fresh CI-built digest
        │                                        │
        ▼                                        ▼
stale plugins in e2e                     latest plugin build in e2e

Note

Proposed by chai-bot (redhat-chai-bot), opened as draft via Claude Code.

Summary by CodeRabbit

Updates six OADP operator CI configuration files for oadp-1.6 and oadp-dev. The configurations define CI-built plugin images in base_images and substitute them into operator bundles through operator.substitutions.

The mappings cover 17 images for oadp-1.6 and 14 images for oadp-dev. Three oadp-dev images are excluded because no CI configurations exist. oadp-vmfr-access-filebrowser is excluded because no CI repository builds it.

Summary by CodeRabbit

This PR updates OpenShift CI configurations for the OADP operator across oadp-1.3 through oadp-1.6 and oadp-dev.

The configurations now define CI-built plugin images under base_images and map operator bundle image references through operator.substitutions. E2E jobs can use fresh CI image digests without waiting for hourly image mirroring.

The image sets match each release configuration. Unsupported images remain excluded when no CI build or configuration exists.

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 31, 2026
@openshift-ci

openshift-ci Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2026
@coderabbitai

coderabbitai Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Caution

Review failed

An error occurred during the review process. Please try again later.

Walkthrough

The CI configurations add OADP base-image definitions and operator bundle substitutions for OADP 1.3 through 1.6 and development releases across multiple OpenShift versions.

Changes

OADP CI image mappings

Layer / File(s) Summary
OADP 1.3–1.5 release mappings
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.[3-5]__*.yaml
Adds base-image definitions and bundle substitutions for Velero and provider-plugin images.
OADP 1.6 component mappings
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__*.yaml
Adds base-image definitions and bundle substitutions for OADP utilities, Velero, KubeVirt, HyperShift, VM, and cloud-provider plugin images.
Development component mappings
ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__*.yaml
Adds development base-image definitions and bundle substitutions for OADP, Velero, KubeVirt DataMover, VM, and cloud-provider plugin images.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Suggested reviewers: mrnold, joeavaikath

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the added CI image substitutions, including base images and operator substitutions, which match the main changes.
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 The PR changes only 10 YAML CI configuration files; the 800 added lines define base_images and substitutions, with no Ginkgo test declarations or test titles.
Test Structure And Quality ✅ Passed The PR changes only 10 YAML CI configuration files; no Ginkgo test paths, declarations, assertions, waits, setup, or cleanup code were added.
Microshift Test Compatibility ✅ Passed The pull request changes only 10 YAML CI configuration files; no Ginkgo tests or test declarations were added or modified, so MicroShift compatibility review is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The PR changes only ten CI YAML files with base_images and operator.substitutions; no Go files, Ginkgo tests, or multi-node test logic were added.
Topology-Aware Scheduling Compatibility ✅ Passed The PR changes only CI YAML base_images and operator.substitutions; it adds no deployment manifests, controllers, or topology-related scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The pull request changes only 10 YAML CI configuration files; no process-level code or stdout writes appear in the diff.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR changes only 10 CI YAML files; it adds no Ginkgo tests, IPv4 assumptions, or test-time external connectivity.
No-Weak-Crypto ✅ Passed The PR changes only 10 YAML CI configuration files; added-line scans found no MD5, SHA1, DES, RC4, Blowfish, ECB, crypto API, custom crypto, or secret-comparison usage.
Container-Privileges ✅ Passed The 10 changed CI YAML files add only image mappings and substitutions; privilege-field searches found no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, escalation, or root settings.
No-Sensitive-Data-In-Logs ✅ Passed The PR adds only YAML image names, namespaces, tags, and pullspec substitutions; scans found no credentials, PII, sensitive literals, or new logging directives.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@redhat-chai-bot
redhat-chai-bot force-pushed the oadp-plugin-image-substitutions branch from 18b488f to 1bcbd31 Compare July 31, 2026 21:25
@kaovilai
kaovilai marked this pull request as ready for review July 31, 2026 22:03
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 31, 2026
@openshift-ci
openshift-ci Bot requested review from Joeavaikath and mrnold July 31, 2026 22:04
@redhat-chai-bot
redhat-chai-bot force-pushed the oadp-plugin-image-substitutions branch from 1bcbd31 to 7bf886d Compare July 31, 2026 22:23
@redhat-chai-bot

Copy link
Copy Markdown
Contributor

/pj-rehearse max

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@redhat-chai-bot
redhat-chai-bot force-pushed the oadp-plugin-image-substitutions branch from 7bf886d to e484001 Compare July 31, 2026 22:35
@openshift-ci openshift-ci Bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 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 470e877f3bb48243733ac64282078206b0864bb5 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.

@redhat-chai-bot
redhat-chai-bot force-pushed the oadp-plugin-image-substitutions branch from e484001 to 466820c Compare July 31, 2026 22:50
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2026
Add base_images and operator.substitutions for OADP plugin images
(velero, openshift-velero-plugin, velero-plugin-for-aws/csi/gcp/azure)
across all OADP operator CI configurations. Remove deprecated CLI
e2e test definitions. Regenerate prowjob YAML files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@redhat-chai-bot
redhat-chai-bot force-pushed the oadp-plugin-image-substitutions branch from 466820c to 0e5aef0 Compare August 1, 2026 00:01
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2026
@openshift-ci

openshift-ci Bot commented Aug 1, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@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.4-4.18-e2e-test-hcp-aws openshift/oadp-operator presubmit Presubmit changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-index openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-e2e-test-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-e2e-test-hcp-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-e2e-test-kubevirt-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.5-4.19-images openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-index 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
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-index openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-cli-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-hcp-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-e2e-test-kubevirt-aws openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-images openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-tls-pqc-readiness openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.22-tls13-adherence openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-index openshift/oadp-operator presubmit Ci-operator config 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-dev-4.22-tls-pqc-readiness openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-dev-4.22-tls13-adherence openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-index openshift/oadp-operator presubmit Ci-operator config changed
pull-ci-openshift-oadp-operator-oadp-1.6-4.18-images openshift/oadp-operator presubmit Ci-operator config changed

A total of 74 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.

@redhat-chai-bot

Copy link
Copy Markdown
Contributor

/pj-rehearse max

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@kaovilai

kaovilai commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse 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 openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 3, 2026
@kaovilai

kaovilai commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

/lgtm

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@kaovilai: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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.

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, sseago

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

kaovilai commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

@redhat-chai-bot don't downgrade images, I see instances of going down to go 1.23.

@kaovilai

kaovilai commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

/hold for fix.
@redhat-chai-bot unhold only when the images are back to go 1.26 across the board

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants