ROSAENG-1340: Add OSDFM support to rosa-e2e-ocm-fvt ref by dustman9000 · Pull Request #79883 · openshift/release

dustman9000 · 2026-05-29T19:37:28Z

Summary

Adds OCM_FVT_SERVICE and OCM_FVT_REPORT_JIRA env vars to the rosa-e2e-ocm-fvt step registry ref (created in #79840) so it can support OSDFM tests in addition to CMS tests.

Env Var	Default	Description
`OCM_FVT_SERVICE`	`cms`	The ocmtest `--service` flag (`cms`, `osdfm`)
`OCM_FVT_REPORT_JIRA`	`true`	Enable `--reportJiraTicket` and Jira credential sourcing

Existing CMS tests are unaffected since both default to their current behavior.

OSDFM usage example

- as: ocm-fvt-periodic-osdfm-mc-autoscaling-integration
  capabilities:
  - nested-podman
  cron: 0 11 * * 0
  nested_podman: true
  steps:
    env:
      OCM_FVT_JOB_NAME: osdfm-mc-autoscaling-integration
      OCM_FVT_OCM_ENV: integration
      OCM_FVT_REPORT_JIRA: "false"
      OCM_FVT_SERVICE: osdfm
    test:
    - ref: rosa-e2e-ocm-fvt

Jira: https://redhat.atlassian.net/browse/ROSAENG-1340

Test plan

CI checks pass (no config changes, only ref updates with backward-compatible defaults)
PR OCM-24587| feat: Add Prow periodic for OSDFM MC autoscaling (integration) #79207 can adopt this ref once both merge

Summary by CodeRabbit

This PR extends the rosa-e2e-ocm-fvt step configuration in the OpenShift CI infrastructure to support testing both OCM (Cloud Management) and OSDFM (OSD Fleet Manager) services, previously limited to CMS testing only.

Practical Impact:

The changes add two new environment variables to the shared step registry reference:

OCM_FVT_SERVICE: Controls which service the tests run against (cms or osdfm), defaulting to cms to maintain backward compatibility
OCM_FVT_REPORT_JIRA: Controls whether Jira ticket reporting is enabled (default true)

Technical Changes:

The implementation refactors the step's shell command script to:

Dynamically build the ocmtest command arguments based on the OCM_FVT_SERVICE variable
Conditionally enable Jira credential sourcing and reporting based on OCM_FVT_REPORT_JIRA
Properly manage environment variable injection and filtering for the test execution environment

Affected Workflows:

Jobs using the shared rosa-e2e-ocm-fvt step can now run OSDFM periodic tests by setting OCM_FVT_SERVICE: osdfm and OCM_FVT_REPORT_JIRA: "false", while existing jobs continue to work without modification since the defaults preserve the existing CMS behavior.

This change enables broader test coverage for ROSA CI pipelines across multiple service implementations while maintaining the stability of existing test workflows.

Add OCM_FVT_SERVICE and OCM_FVT_REPORT_JIRA env vars to the shared FVT step registry ref so it can be used for OSDFM tests in addition to CMS tests. - OCM_FVT_SERVICE (default "cms"): ocmtest --service flag - OCM_FVT_REPORT_JIRA (default "true"): controls --reportJiraTicket, ENABLE_JIRA_REPORTING, and jira-cred sourcing Existing CMS tests are unaffected since both default to their current behavior. Jira: https://redhat.atlassian.net/browse/ROSAENG-1340

openshift-ci-robot · 2026-05-29T19:37:32Z

@dustman9000: This pull request references ROSAENG-1340 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 "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Adds OCM_FVT_SERVICE and OCM_FVT_REPORT_JIRA env vars to the rosa-e2e-ocm-fvt step registry ref (created in #79840) so it can support OSDFM tests in addition to CMS tests.

Env Var Default Description

OCM_FVT_SERVICE cms The ocmtest --service flag (cms, osdfm)

OCM_FVT_REPORT_JIRA true Enable --reportJiraTicket and Jira credential sourcing

Existing CMS tests are unaffected since both default to their current behavior.

OSDFM usage example
- as: ocm-fvt-periodic-osdfm-mc-autoscaling-integration
 capabilities:
 - nested-podman
 cron: 0 11 * * 0
 nested_podman: true
 steps:
   env:
     OCM_FVT_JOB_NAME: osdfm-mc-autoscaling-integration
     OCM_FVT_OCM_ENV: integration
     OCM_FVT_REPORT_JIRA: "false"
     OCM_FVT_SERVICE: osdfm
   test:
   - ref: rosa-e2e-ocm-fvt
Jira: https://redhat.atlassian.net/browse/ROSAENG-1340

Test plan

CI checks pass (no config changes, only ref updates with backward-compatible defaults)

PR OCM-24587| feat: Add Prow periodic for OSDFM MC autoscaling (integration) #79207 can adopt this ref once both merge

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.

coderabbitai · 2026-05-29T19:37:55Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: ab5c93c4-9d0f-4d58-8a56-45e02fcbc800

📥 Commits

Reviewing files that changed from the base of the PR and between 40073ff and c9390a1.

📒 Files selected for processing (2)

ci-operator/step-registry/rosa/e2e/ocm-fvt/rosa-e2e-ocm-fvt-commands.sh
ci-operator/step-registry/rosa/e2e/ocm-fvt/rosa-e2e-ocm-fvt-ref.yaml

Walkthrough

This pull request updates the ROSA OCM FVT test step to add configurable service selection and improve JIRA reporting integration. The step configuration now exports an OCM_FVT_SERVICE variable (defaulting to "cms"), and the command script refactors credential injection and ocmtest invocation to support dynamic JOB_LINK, conditional JIRA reporting, and parameterized service arguments.

Changes

OCM FVT Service Parameterization and Reporting

Layer / File(s)	Summary
Step configuration for OCM FVT service parameterization `ci-operator/step-registry/rosa/e2e/ocm-fvt/rosa-e2e-ocm-fvt-ref.yaml`	Step ref.yaml defines new `OCM_FVT_SERVICE` environment variable (defaulting to `"cms"`) to select between CMS and OSDFM test runs, and updates the step description to document support for CMS, OSDFM, AWS, GCP, and integration environments via environment-variable parameterization.
Command script refactoring for dynamic service and JIRA reporting `ci-operator/step-registry/rosa/e2e/ocm-fvt/rosa-e2e-ocm-fvt-commands.sh`	Command script updates Podman env file creation to include computed `JOB_LINK` and conditional `ENABLE_JIRA_REPORTING`, refactors credential injection to dynamically construct `cred_sources` with conditional JIRA credentials, and refactors ocmtest invocation to build argument array with configurable `--service` (defaulting to `"cms"`), `--job`, and conditional `--reportJiraTicket`.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

openshift/release#78767: Both PRs coordinate OCM FVT job execution around the same runtime concerns—constructing JOB_LINK/Jira-reporting inputs for ocmtest—even though the main PR refactors the shared command script and step env (OCM_FVT_SERVICE) while the retrieved PR adds a new Prow periodic YAML that implements that JOB_LINK/Jira logic.

Suggested reviewers

bmeng

🚥 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 and specifically summarizes the main change: adding OSDFM support to the rosa-e2e-ocm-fvt ref, which aligns with the changeset that adds the OCM_FVT_SERVICE environment variable and related functionality.
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 shell scripts and YAML config files, no Ginkgo tests. Check is not applicable to these file types.
Test Structure And Quality	✅ Passed	PR contains only shell script and YAML configuration files, not Ginkgo test code. Custom check for Ginkgo test quality is not applicable.
Microshift Test Compatibility	✅ Passed	PR does not add new Ginkgo e2e tests; it only modifies CI step registry configuration and shell scripts (bash and YAML). No Go test files or Ginkgo test patterns are present in the changes.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PR contains only bash script and YAML CI/CD config changes. No Ginkgo e2e tests are added, so SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility	✅ Passed	PR modifies CI step registry configurations and test scripts, not deployment manifests. No pod scheduling constraints are introduced.
Ote Binary Stdout Contract	✅ Passed	PR modifies only shell scripts and YAML CI config files in step-registry, not OTE binary code. Check applies only to Go binaries with stdout JSON communication.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR adds shell scripts and YAML configuration only; no new Ginkgo e2e tests with IPv4 or external connectivity code are introduced.
No-Weak-Crypto	✅ Passed	No weak crypto algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementations, or insecure secret comparisons detected in the CI/CD configuration changes.
Container-Privileges	✅ Passed	No privileged container flags found in ref.yaml or commands.sh. No privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, or allowPrivilegeEscalation configurations present.
No-Sensitive-Data-In-Logs	✅ Passed	No sensitive data exposure detected. Script only logs non-sensitive configuration values; credentials are sourced but not logged, using restricted temp files with 077 umask.

_{✏️ 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-merge-bot · 2026-05-29T19:40:24Z

[REHEARSALNOTIFIER]
@dustman9000: 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
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-sts-shared-vpc-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-osd-rh-aws-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-sts-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-osd-gcp-staging-ocm-fvt-periodic-cs-osd-ccs-gcp-ad-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-zero-egress-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-ocm-resources-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-autonode-integration-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-arm-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-adobe-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-osd-gcp-staging-ocm-fvt-periodic-cs-osd-ccs-gcp-marketplace-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-hcp-e2e-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-ad-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-pl-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-autonode-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-zero-egress-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-sts-ad-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-amd64-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-hcp-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-backup-restore-integration-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-integration-ocm-fvt-periodic-cs-rosa-hcp-bkp-cp-upgrade-integration-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-y-upgrade-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-amd64-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-sts-pl-staging-main	N/A	periodic	Registry content changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-rosa-ad-staging-main	N/A	periodic	Registry content changed

A total of 28 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
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

dustman9000 · 2026-05-29T19:56:10Z

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-osd-gcp-staging-ocm-fvt-periodic-cs-osd-ccs-gcp-ad-staging-main periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-hcp-staging-ocm-fvt-periodic-cs-rosa-hcp-adobe-staging-main periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-rosa-classic-staging-ocm-fvt-periodic-cs-ocm-resources-staging-main

openshift-merge-bot · 2026-05-29T19:56:13Z

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

tinaafitz · 2026-05-29T20:31:48Z

/lgtm

dustman9000 · 2026-05-29T20:32:13Z

/pj-rehearse ack

openshift-merge-bot · 2026-05-29T20:32:16Z

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

openshift-ci · 2026-05-29T20:32:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustman9000, tinaafitz

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:

~~ci-operator/step-registry/rosa/e2e/ocm-fvt/OWNERS~~ [dustman9000]

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

) Add OCM_FVT_SERVICE and OCM_FVT_REPORT_JIRA env vars to the shared FVT step registry ref so it can be used for OSDFM tests in addition to CMS tests. - OCM_FVT_SERVICE (default "cms"): ocmtest --service flag - OCM_FVT_REPORT_JIRA (default "true"): controls --reportJiraTicket, ENABLE_JIRA_REPORTING, and jira-cred sourcing Existing CMS tests are unaffected since both default to their current behavior. Jira: https://redhat.atlassian.net/browse/ROSAENG-1340

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 29, 2026

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

openshift-ci Bot requested review from jfrazierRedHat and tiwillia May 29, 2026 19:38

openshift-ci Bot assigned tinaafitz May 29, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2026

openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 29, 2026

openshift-merge-bot Bot merged commit 088603e into openshift:main May 29, 2026
12 of 14 checks passed

coderabbitai Bot mentioned this pull request Jun 2, 2026

ROSAENG-391: Preserve FVT test output in artifacts to avoid log redaction #79997

Closed

2 tasks

Navigation Menu

Uh oh!

ROSAENG-1340: Add OSDFM support to rosa-e2e-ocm-fvt ref - #79883

ROSAENG-1340: Add OSDFM support to rosa-e2e-ocm-fvt ref#79883
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dustman9000:rosaeng-1340/fvt-ref-osdfm-support

dustman9000 commented May 29, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

openshift-ci-robot commented May 29, 2026 •

edited by atlassian Bot

Loading

Summary

OSDFM usage example

Test plan

Uh oh!

coderabbitai Bot commented May 29, 2026 •

edited

Loading

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

dustman9000 commented May 29, 2026

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

tinaafitz commented May 29, 2026

Uh oh!

dustman9000 commented May 29, 2026

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

openshift-ci Bot commented May 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

dustman9000 commented May 29, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

OSDFM usage example

Test plan

Summary by CodeRabbit

Uh oh!

openshift-ci-robot commented May 29, 2026 • edited by atlassian Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

OSDFM usage example

Test plan

Uh oh!

coderabbitai Bot commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

dustman9000 commented May 29, 2026

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

tinaafitz commented May 29, 2026

Uh oh!

dustman9000 commented May 29, 2026

Uh oh!

openshift-merge-bot Bot commented May 29, 2026

Uh oh!

openshift-ci Bot commented May 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dustman9000 commented May 29, 2026 •

edited by coderabbitai Bot

Loading

openshift-ci-robot commented May 29, 2026 •

edited by atlassian Bot

Loading

coderabbitai Bot commented May 29, 2026 •

edited

Loading