Skip to content

ROSAENG-60110: Standardize ROSA Prow job naming with environment#80936

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dustman9000:rosaeng-60110/standardize-job-naming
Jun 23, 2026
Merged

ROSAENG-60110: Standardize ROSA Prow job naming with environment#80936
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
dustman9000:rosaeng-60110/standardize-job-naming

Conversation

@dustman9000

@dustman9000 dustman9000 commented Jun 23, 2026

Copy link
Copy Markdown
Member

Summary

Add environment shorthand (stg/int/prd) to all ROSA Prow job names for consistent Sippy categorization and human readability.

rosa-e2e nightlies (20 jobs): insert stg- before channel

  • rosa-hcp-e2e-stable-4-22 -> rosa-hcp-e2e-stg-stable-4-22

rosa-e2e upgrades (2 jobs): insert stg- before version range

  • rosa-hcp-upgrade-4-20-to-4-21 -> rosa-hcp-upgrade-stg-4-20-to-4-21

FVT jobs (36 jobs): rename staging/integration/production to stg/int/prd in both config filenames (variants) and as: values

  • ocm-fvt-rosa-hcp-staging -> ocm-fvt-rosa-hcp-stg
  • ocm-fvt-periodic-cs-rosa-hcp-ad-staging-main -> ocm-fvt-periodic-cs-rosa-hcp-ad-stg-main

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

Summary by CodeRabbit

This pull request standardizes ROSA Prow job naming by adding environment segment notation to improve consistency in Sippy categorization and human readability.

Changes Made

ROSA e2e nightly jobs (openshift-online-rosa-e2e-main__periodics.yaml)
Updated 20 periodic test job names by inserting the staging segment into their Argo workflow identifiers. This affects:

  • HCP stable versions 4.19–4.22
  • HCP nightly 5.0
  • Classic STS stable versions 4.19–4.22
  • HCP FIPS stable versions 4.19–4.22
  • HCP FIPS nightly 5.0
  • Classic FIPS STS stable versions 4.19–4.22
  • OSD-GCP stable 4.22 (both standard and FIPS)

Example: rosa-hcp-e2e-stable-4-19rosa-hcp-e2e-staging-stable-4-19

ROSA e2e upgrade jobs (openshift-online-rosa-e2e-main__upgrade.yaml)
Updated 2 upgrade test job names to include the staging environment segment:

  • Classic STS upgrade: rosa-classic-sts-upgrade-4-20-to-4-21rosa-classic-sts-upgrade-staging-4-20-to-4-21
  • HCP upgrade: rosa-hcp-upgrade-4-20-to-4-21rosa-hcp-upgrade-staging-4-20-to-4-21

All other job configuration fields (cron schedules, environment variables, workflow references, etc.) remain unchanged. The modifications are surgical, affecting only the Argo workflow naming identifiers used for test categorization and reporting.

Dependencies & Considerations

This change has an upstream dependency: related FVT job names in the ocm-backend-tests repository must be aligned before this PR merges. An upstream merge request (MR 1963) has been created to coordinate these changes across the two repositories.

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

openshift-ci-robot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@dustman9000: This pull request references ROSAENG-60110 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

Add environment shorthand (stg/int/prd) to all ROSA Prow job names for consistent Sippy categorization and human readability.

rosa-e2e nightlies (20 jobs): insert stg- before channel

  • rosa-hcp-e2e-stable-4-22 -> rosa-hcp-e2e-stg-stable-4-22

rosa-e2e upgrades (2 jobs): insert stg- before version range

  • rosa-hcp-upgrade-4-20-to-4-21 -> rosa-hcp-upgrade-stg-4-20-to-4-21

FVT jobs (36 jobs): rename staging/integration/production to stg/int/prd in both config filenames (variants) and as: values

  • ocm-fvt-rosa-hcp-staging -> ocm-fvt-rosa-hcp-stg
  • ocm-fvt-periodic-cs-rosa-hcp-ad-staging-main -> ocm-fvt-periodic-cs-rosa-hcp-ad-stg-main

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

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

coderabbitai Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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: 69c015a6-5359-46d4-a1ab-f5587d940fbd

📥 Commits

Reviewing files that changed from the base of the PR and between fc20c46 and d86de92.

⛔ 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 (2)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__periodics.yaml
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__upgrade.yaml
✅ Files skipped from review due to trivial changes (1)
  • ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__upgrade.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__periodics.yaml

Walkthrough

Two CI config files for ROSA e2e tests (periodics and upgrade) had their Argo workflow as: identifiers updated to include a staging segment across all test entries. No cron schedules, environment variables, workflows, or other fields were modified.

Changes

ROSA e2e staging identifier rename

Layer / File(s) Summary
Periodics: add staging to all as: identifiers
ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__periodics.yaml
Inserts staging into the as: names for HCP stable 4.19–4.22, HCP nightly 5.0, classic STS stable 4.19–4.22, HCP FIPS stable 4.19–4.22, HCP FIPS nightly 5.0, classic FIPS STS stable 4.19–4.22, osd-gcp stable 4.22, and osd-gcp FIPS stable 4.22.
Upgrade: add staging to as: identifiers
ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main__upgrade.yaml
Inserts staging into the as: names for the classic STS and HCP upgrade test entries (4.20→4.21).

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

lgtm

Suggested reviewers

  • ravitri
  • joshbranham
🚥 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 'ROSAENG-60110: Standardize ROSA Prow job naming with environment' clearly describes the main change—standardizing job naming with environment notation—which aligns with the PR's core objective of adding environment shorthand to 58 ROSA jobs.
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 This PR modifies only CI configuration YAML files (Prow job definitions), not Go test code. The custom check targets Ginkgo test names in Go source code, which are not present in this PR.
Test Structure And Quality ✅ Passed PR contains only CI/CD configuration YAML files (Prow job definitions), not Ginkgo test code. Custom check for test structure and quality is not applicable to configuration files.
Microshift Test Compatibility ✅ Passed PR adds no new Ginkgo e2e tests; only modifies CI configuration files (YAML) to update Prow job names. Check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR modifies only Prow job configuration files (YAML), not Ginkgo e2e test code. The SNO compatibility check applies only to new test additions; not to CI/CD job naming changes.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only Prow CI configuration files with test job name updates; no deployment manifests, operator code, or pod scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR only modifies YAML Prow job configuration files, not OTE binary source code. No stdout contract violations are possible in configuration files.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR; changes are YAML CI job configuration renaming only, making the IPv6/disconnected network test compatibility check inapplicable.
No-Weak-Crypto ✅ Passed The PR modifies YAML configuration files for ROSA Prow CI/CD jobs, adding environment identifiers (stg/int/prd) to job names. No cryptographic code, weak algorithms (MD5, SHA1, DES, RC4, 3DES, Blow...
Container-Privileges ✅ Passed PR contains only naming changes to Prow job identifiers in CI/CD config files. No privileged containers, elevated capabilities, or security-escalation fields found.
No-Sensitive-Data-In-Logs ✅ Passed No logging statements exposing sensitive data were added. Changes are purely naming updates to Prow job identifiers in CI configuration files with no new logging, scripts, or credential exposure.

✏️ 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.

@openshift-ci openshift-ci Bot requested review from jfrazierRedHat and ravitri June 23, 2026 16:43
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2026
@dustman9000 dustman9000 force-pushed the rosaeng-60110/standardize-job-naming branch from b8be8d1 to f0951d3 Compare June 23, 2026 17:23
@lucasponce

Copy link
Copy Markdown

You need to ensure in the FVT ones that the target job invoked is correct:
https://gitlab.cee.redhat.com/service/ocm-backend-tests/-/blob/master/data/ci/jobs/cms.yml?ref_type=heads

Where the naming is aligned there, otherwise the prow job may fail to invoke the ocm-backend-test job.

It's a technical debt, I'm fine with the rename but it requires first to adjust in the ocm-backend-test repo and then propagate the dependency in prow config.

@dustman9000

Copy link
Copy Markdown
Member Author

Good catch, thanks Lucas. Created the upstream MR to rename the job names in ocm-backend-tests first: https://gitlab.cee.redhat.com/service/ocm-backend-tests/-/merge_requests/1963

This PR should merge after that MR lands.

@dustman9000 dustman9000 force-pushed the rosaeng-60110/standardize-job-naming branch from f0951d3 to fc20c46 Compare June 23, 2026 18:06
Add 'staging' to rosa-e2e nightly and upgrade job names so they
consistently indicate which OCM environment they target. This
aligns with the FVT jobs which already include staging/integration
in their names.

Nightly periodics: rosa-hcp-e2e-stable-4-22 -> rosa-hcp-e2e-staging-stable-4-22
Upgrades: rosa-hcp-upgrade-4-20-to-4-21 -> rosa-hcp-upgrade-staging-4-20-to-4-21

FVT jobs are unchanged (already have staging/integration/production).

Jira: https://redhat.atlassian.net/browse/ROSAENG-60110
@dustman9000 dustman9000 force-pushed the rosaeng-60110/standardize-job-naming branch from fc20c46 to d86de92 Compare June 23, 2026 18:18
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@dustman9000: all tests passed!

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.

@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-periodics-rosa-hcp-fips-e2e-staging-stable-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-e2e-staging-stable-4-20 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-e2e-staging-stable-4-20 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-e2e-staging-stable-4-19 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-fips-e2e-staging-stable-4-19 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-e2e-staging-stable-4-19 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-upgrade-rosa-hcp-upgrade-staging-4-20-to-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-e2e-staging-stable-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-fips-e2e-staging-stable-4-22 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-e2e-staging-stable-4-22 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-fips-e2e-staging-nightly-5-0 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-fips-e2e-staging-stable-4-20 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-e2e-staging-nightly-5-0 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-osd-gcp-fips-e2e-staging-stable-4-22 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-fips-e2e-staging-stable-4-22 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-osd-gcp-e2e-staging-stable-4-22 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-fips-e2e-staging-stable-4-20 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-upgrade-rosa-classic-sts-upgrade-staging-4-20-to-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-fips-e2e-staging-stable-4-19 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-e2e-staging-stable-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-classic-sts-fips-e2e-staging-stable-4-21 N/A periodic Periodic changed
periodic-ci-openshift-online-rosa-e2e-main-periodics-rosa-hcp-e2e-staging-stable-4-22 N/A periodic Periodic 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.

@dustman9000

Copy link
Copy Markdown
Member Author

To reduce churn, we will stick to the long-form env names for now. I've updated this PR to just update the non-FVT job names.

@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 Jun 23, 2026
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

[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

@dustman9000

Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@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.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 23, 2026
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
dustman9000 added a commit to dustman9000/rosa-e2e-1 that referenced this pull request Jun 23, 2026
Update rosa-e2e nightly and upgrade job names to include 'staging'
and add environment labels to category names for clearer daily
Slack reporting.

Depends on: openshift/release#80936
@openshift-merge-bot openshift-merge-bot Bot merged commit 58dbeb0 into openshift:main Jun 23, 2026
16 checks passed
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants