Skip to content

OCM-23823: migrate cs-ocm-resources-staging-main FVT to Prow#78690

Open
dustman9000 wants to merge 2 commits intoopenshift:mainfrom
dustman9000:migrate-ocm-resources-fvt
Open

OCM-23823: migrate cs-ocm-resources-staging-main FVT to Prow#78690
dustman9000 wants to merge 2 commits intoopenshift:mainfrom
dustman9000:migrate-ocm-resources-fvt

Conversation

@dustman9000
Copy link
Copy Markdown
Member

@dustman9000 dustman9000 commented May 1, 2026

Summary

  • Adds Prow periodic for the cs-ocm-resources-staging-main OCM FVT job
  • Migrates from Tekton/Konflux to the standard ocmci-based pattern
  • Tests OCM resource management (2 specific test cases for OCM-17364)
  • Scheduled daily at 10:30 UTC

Test plan

  • make jobs regenerated periodics successfully
  • Wait for pj-rehearse notifier and run rehearsals
  • Verify job name matches ocm-backend-tests/data/ci/jobs/cms.yml entry

Jira: https://redhat.atlassian.net/browse/OCM-23823

Summary by CodeRabbit

  • Chores
    • Added a new daily CI job to run end-to-end tests for the staging OCM service (improved automated coverage).
    • Renamed a shared AWS credentials variable used by CI jobs for consistency.
    • Fixed CI log URL handling so job logs link correctly for both PR and branch runs.

Add Prow periodic for the OCM resources staging FVT job,
migrating from Tekton/Konflux to the standard ocmci-based pattern.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 1, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 1, 2026

@dustman9000: This pull request references OCM-23823 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 task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Adds Prow periodic for the cs-ocm-resources-staging-main OCM FVT job
  • Migrates from Tekton/Konflux to the standard ocmci-based pattern
  • Tests OCM resource management (2 specific test cases for OCM-17364)
  • Scheduled daily at 10:30 UTC

Test plan

  • make jobs regenerated periodics successfully
  • Wait for pj-rehearse notifier and run rehearsals
  • Verify job name matches ocm-backend-tests/data/ci/jobs/cms.yml entry

Jira: https://redhat.atlassian.net/browse/OCM-23823

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
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 1, 2026

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: a94d1633-f7d9-4513-bc47-49dfd06fa520

📥 Commits

Reviewing files that changed from the base of the PR and between fa56b6b and 221d3b8.

📒 Files selected for processing (1)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml

Walkthrough

Renames a shared VPC AWS credentials env var, adjusts computed job log URLs, and adds a new daily periodic OCM test job that sources secrets and runs ocmtest test --service cms inside a nested-podman container for cs-ocm-resources-staging-main (cron: 30 10 * * *).

Changes

Cohort / File(s) Summary
CI Job Configuration
ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml
Renamed env var SHARED_VPC_AWS_SHARED_CREDENTIALS_FILEAWS_SHARED_VPC_CREDENTIALS_FILE across periodic OCM jobs; updated PR and non-PR JOB_LINK log URL computation; added new daily periodic job ocm-fvt-periodic-cs-ocm-resources-staging-main that builds /tmp/podman.env, sources ocm-tokens and jira-cred, and runs ocmtest test --service cms inside a nested-podman container (cron: 30 10 * * *).

Sequence Diagram(s)

sequenceDiagram
    participant Scheduler as Prow Scheduler
    participant JobPod as Kubernetes Pod (job)
    participant Nested as Nested Podman Container
    participant Secrets as Mounted Secrets
    participant OCM as ocmtest
    participant Logs as Prow Logs / Storage

    Scheduler->>JobPod: trigger periodic job (cron)
    JobPod->>Secrets: read `/var/run/secret/...` (ocm-tokens, jira-cred)
    JobPod->>JobPod: build `/tmp/podman.env`
    JobPod->>Nested: launch nested podman container (sourced env)
    Nested->>Secrets: source credentials (AWS_SHARED_VPC_CREDENTIALS_FILE)
    Nested->>OCM: run `ocmtest test --service cms` for cs-ocm-resources-staging-main
    OCM->>Logs: emit test logs
    JobPod->>Logs: compute JOB_LINK and upload/annotate logs
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly references the main objective: migrating cs-ocm-resources-staging-main FVT to Prow, which aligns with the primary change in the PR.
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 modifies only YAML CI configuration files, not Ginkgo test code with test titles.
Test Structure And Quality ✅ Passed PR modifies CI/CD configuration YAML files, not Ginkgo test code, so this check does not apply.
Microshift Test Compatibility ✅ Passed This PR modifies CI/CD configuration only and does not add Ginkgo e2e tests, so the MicroShift Test Compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only Prow CI configuration YAML without adding new Ginkgo e2e tests in Go code, so SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed This PR modifies a ci-operator test configuration file with no Kubernetes pod scheduling constraints, node affinity rules, or topology spread constraints.
Ote Binary Stdout Contract ✅ Passed This check is not applicable to this PR as it only modifies CI configuration YAML files, not test binary code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only modifies Prow CI job configuration in YAML format without adding new Ginkgo e2e tests in Go source code.

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

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

Review rate limit: 8/10 reviews remaining, refill in 10 minutes and 31 seconds.

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

@openshift-ci openshift-ci Bot requested review from bmeng and ravitri May 1, 2026 15:43
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 1, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml`:
- Around line 204-208: The JOB_LINK construction uses the wrong repo slug and
creates double slashes; change the PR branch to use the correct repo slug
"openshift/release" when building the PR log path (replace
"openshift-online_rosa-e2e" with "openshift/release" in the PR branch) and
eliminate double slashes by normalizing concatenation: set JOB_LINK without a
trailing slash (the initial JOB_LINK assignment) or remove leading slashes from
the appended segments so the conditional branches (the code manipulating
JOB_LINK and the "${PULL_NUMBER}" branch) join paths cleanly.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 95417ca8-1670-4d74-8a9a-f25b44f4dd70

📥 Commits

Reviewing files that changed from the base of the PR and between 6b9f483 and fa56b6b.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-periodics.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml

Comment thread ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml Outdated
@dustman9000
Copy link
Copy Markdown
Member Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-ocm-resources-staging-main

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@dustman9000
Copy link
Copy Markdown
Member Author

/retest

@dustman9000
Copy link
Copy Markdown
Member Author

/pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-ocm-resources-staging-main

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@dustman9000
Copy link
Copy Markdown
Member Author

/retest

@dustman9000
Copy link
Copy Markdown
Member Author

/retest-required

- SHARED_VPC_AWS_SHARED_CREDENTIALS_FILE -> AWS_SHARED_VPC_CREDENTIALS_FILE
- Remove leading / in JOB_LINK paths to avoid double-slash
- Use openshift_release in pr-logs path (where Prow runs)
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[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-periodic-cs-rosa-sts-ad-integration-main N/A periodic Ci-operator config changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-rosa-sts-ad-staging-main N/A periodic Ci-operator config changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-ocm-resources-staging-main N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-rosa-ad-staging-main N/A periodic Ci-operator config changed
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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 1, 2026

@dustman9000: The following test 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/periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-ocm-resources-staging-main fa56b6b link unknown /pj-rehearse periodic-ci-openshift-online-rosa-e2e-main-ocm-fvt-periodic-cs-ocm-resources-staging-main

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.

@jfrazierRedHat
Copy link
Copy Markdown
Contributor

/lgtm

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

openshift-ci Bot commented May 1, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants