Combining ROSA CLI and Terraform Provider periodic jobs#80256
Draft
jerichokeyne wants to merge 1 commit into
Draft
Combining ROSA CLI and Terraform Provider periodic jobs#80256jerichokeyne wants to merge 1 commit into
jerichokeyne wants to merge 1 commit into
Conversation
ROSACLI:
- Changing Slack message template to match TF provider jobs
- All tests targeting production have been removed
- `rosa-sts-advanced-prod-critical-high-f3`
- `rosa-hcp-advanced-prod-critical-high-f3`
- `rosa-sts-upgrade-y-stream-prod-f3`
- `rosa-sts-advanced-critical-high-f3` +
`rosa-sts-advanced-medium-low-f7` -> `rosa-sts-advanced-f3`
- `rosa-sts-shared-vpc-critical-high-f3` +
`rosa-sts-shared-vpc-medium-low-f7` -> `rosa-sts-shared-vpc-f3`
- `rosa-hcp-shared-vpc-critical-high-f3` +
`rosa-hcp-shared-vpc-medium-low-f7` -> `rosa-hcp-shared-vpc-f3`
- `rosa-hcp-external-auth-critical-high-f3` +
`rosa-hcp-external-auth-medium-low-f7` -> `rosa-hcp-external-auth-f3`
- `rosa-hcp-advanced-critical-high-f3` +
`rosa-hcp-advanced-medium-low-f7` -> `rosa-hcp-advanced-f3`
- `rosa-hcp-private-link-critical-high-f3` -> `rosa-hcp-private-link-f3`
- `rosa-ocm-resources-f3` + `rosa-day1-negative-f7` +
`rosa-day1-supplemental-f3` -> `rosa-extra-f3`
Terraform Provider:
- `rosa-sts-advanced-critical-high-f3` +
`rosa-sts-advanced-medium-low-f7` -> `rosa-sts-advanced-f3`
- `rosa-sts-private-critical-high-f3` + `rosa-sts-private-medium-low-f7`
-> `rosa-sts-private-f3`
- `rosa-hcp-advanced-critical-high-f3` +
`rosa-hcp-advanced-medium-low-f7` -> `rosa-hcp-advanced-f3`
- `rosa-hcp-private-critical-high-f3` + `rosa-hcp-private-medium-low-f7`
-> `rosa-hcp-private-f3`
Contributor
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jerichokeyne The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
Contributor
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
Contributor
WalkthroughTwo CI job configuration files for OpenShift ROSA and Terraform provider RHCS are updated: test job variants are consolidated, reporting templates are reformatted to a simpler Slack style, test label filters are tightened, and cluster profiles are adjusted across f3/f7 configurations. ChangesROSA and RHCS CI Job Configuration Consolidation
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml (1)
48-74:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winUpdate QE_USAGE to match the renamed job.
The job was renamed to
rosa-sts-private-f3(line 48), but theQE_USAGElabel at line 67 still references the old namerosa-sts-private-critical-high-f3. This inconsistency could affect telemetry and usage tracking.🔧 Proposed fix
CLUSTER_PROFILE: rosa-sts-pl - QE_USAGE: rosa-sts-private-critical-high-f3 + QE_USAGE: rosa-sts-private-f3 REGION: us-east-1🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml` around lines 48 - 74, Update the QE_USAGE environment variable to match the renamed job; currently the job is named rosa-sts-private-f3 but QE_USAGE is set to rosa-sts-private-critical-high-f3. Edit the env block and change QE_USAGE to rosa-sts-private-f3 (the same value as the job name at the top) so telemetry/usage tracking is consistent with the job rename; verify the variable within the steps -> env section where QE_USAGE is defined.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml`:
- Around line 25-432: The PR renames job identifiers in
openshift-rosa-master__e2e.yaml (see changed as: values such as
rosa-sts-advanced-f3, rosa-sts-shared-vpc-f3, rosa-hcp-shared-vpc-f3, etc.), but
the generated CI job artifacts were not updated; run the repository job artifact
regeneration (e.g., invoke the project's update target like make update or the
canonical job generation command) to regenerate the generated jobs from
openshift-rosa-master__e2e.yaml and commit the resulting generated YAMLs so the
ci-operator/jobs output matches the new as: names.
---
Outside diff comments:
In
`@ci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml`:
- Around line 48-74: Update the QE_USAGE environment variable to match the
renamed job; currently the job is named rosa-sts-private-f3 but QE_USAGE is set
to rosa-sts-private-critical-high-f3. Edit the env block and change QE_USAGE to
rosa-sts-private-f3 (the same value as the job name at the top) so
telemetry/usage tracking is consistent with the job rename; verify the variable
within the steps -> env section where QE_USAGE is defined.
🪄 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: 0b01ec46-bb5c-4771-bf44-611e30725898
⛔ Files ignored due to path filters (2)
ci-operator/jobs/openshift/rosa/openshift-rosa-master-periodics.yamlis excluded by!ci-operator/jobs/**ci-operator/jobs/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main-periodics.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (2)
ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yamlci-operator/config/terraform-redhat/terraform-provider-rhcs/terraform-redhat-terraform-provider-rhcs-main__e2e.yaml
Comment on lines
+25
to
+432
| - as: rosa-sts-advanced-f3 | ||
| cron: 34 13 3,6,9,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-sts-f3 | ||
| TEST_PROFILE: rosa-advanced | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-sts-shared-vpc-f3 | ||
| cron: 59 0 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-sv-f3 | ||
| TEST_PROFILE: rosa-shared-vpc | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-shared-vpc-f3 | ||
| cron: 0 0 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: hcp-sv-f3 | ||
| TEST_PROFILE: rosa-hcp-shared-vpc-advanced | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-sts-private-link-f3 | ||
| cron: 27 23 3,6,9,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-pl-f3 | ||
| TEST_PROFILE: rosa-private-link | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-non-sts-advanced-critical-high-f3 | ||
| cron: 6 6 3,6,9,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "100" | ||
| IMPORTANCE: (Critical,High) | ||
| NAME_PREFIX: rosa-nsts-f3 | ||
| TEST_PROFILE: rosa-non-sts-advanced | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-external-auth-f3 | ||
| cron: 31 15 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: rosa-auth-f3 | ||
| TEST_PROFILE: rosa-hcp-external-auth | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-advanced-f3 | ||
| cron: 29 17 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: rosa-hcp-f3 | ||
| TEST_PROFILE: rosa-hcp-advanced | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-advanced-regional-f3 | ||
| cron: 53 17 3,6,8,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| IMPORTANCE: (Critical,High) | ||
| NAME_PREFIX: rosa-reghcp-f3 | ||
| OCM_LOGIN_ENV: https://api.aws.ap-southeast-1.stage.openshift.com | ||
| REGION: ap-southeast-1 | ||
| TEST_PROFILE: rosa-hcp-advanced | ||
| VERSION: "4.14" | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-private-link-f3 | ||
| cron: 27 19 2,5,8,11,14,17,20,23,26,29 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: rosa-hcppl-f3 | ||
| TEST_PROFILE: rosa-hcp-pl | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-arm-f7 | ||
| cron: 12 0 9,16,23,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| COMPUTE_MACHINE_TYPE: m6g.xlarge | ||
| NAME_PREFIX: rosa-hcparm-f3 | ||
| TEST_PROFILE: rosa-hcp-advanced | ||
| test: | ||
| - chain: rosa-tests-e2e-fullcycle | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-extra-f3 | ||
| cron: 24 19 2,5,8,11,14,17,20,23,26,29 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| TEST_LABEL_FILTERS: (day1-negative,day1-supplemental,ocm-resources)&&!Exclude | ||
| TEST_PROFILE: "null" | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| - as: rosa-sts-upgrade-z-stream-f3 | ||
| cron: 32 18 3,6,9,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-upgz-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-upgrade-z-stream | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-non-sts-upgrade-y-stream-f7 | ||
| cron: 21 12 6,13,20,29 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "100" | ||
| NAME_PREFIX: rosa-upgy-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-non-sts-upgrade-y-stream | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-sts-shared-vpc-upgrade-y-stream-f3 | ||
| cron: 0 0 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-upgy-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-shared-vpc | ||
| VERSION: y-1 | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-sts-upgrade-y-stream-f3 | ||
| cron: 26 16 2,5,8,11,14,17,20,23,26,29 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-upgy-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-upgrade-y-stream | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-upgrade-z-stream-f3 | ||
| cron: 53 12 3,6,9,12,15,18,21,24,27,30 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: rosa-hcpz-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-hcp-upgrade-z-stream | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-hcp-upgrade-y-stream-f3 | ||
| cron: 42 1 1,4,7,10,13,16,19,22,25,28 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| NAME_PREFIX: rosa-hcpy-f3 | ||
| TEST_LABEL_FILTERS: (upgrade)&&!Exclude | ||
| TEST_PROFILE: rosa-hcp-upgrade-y-stream | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle | ||
| - as: rosa-sts-hibernation-f14 | ||
| cron: 3 18 13,29 * * | ||
| reporter_config: | ||
| channel: "#ocm-qe-prow-ci-jobs" | ||
| job_states_to_report: | ||
| - error | ||
| - failure | ||
| - success | ||
| report_template: | ||
| '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* | ||
| ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :slack-yellow: | ||
| Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> | ||
| {{end}}' | ||
| steps: | ||
| cluster_profile: oex-aws-qe | ||
| env: | ||
| CLUSTER_TIMEOUT: "120" | ||
| NAME_PREFIX: rosa-hib-f14 | ||
| TEST_LABEL_FILTERS: (hibernate)&&!Exclude | ||
| TEST_PROFILE: rosa-advanced | ||
| test: | ||
| - ref: rosa-tests | ||
| - ref: rosa-tests-report | ||
| workflow: rosa-lifecycle |
Contributor
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Description: Check if generated ProwJob files exist and were modified for renamed jobs
# Check for generated job files in ci-operator/jobs/ for openshift/rosa
fd -t f -e yaml . ci-operator/jobs/openshift/rosa/ | head -20
# Check git status to see if generated files are staged
git diff --name-only HEAD | rg 'ci-operator/jobs/openshift/rosa'Repository: openshift/release
Length of output: 271
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "Modified generated files (should be non-empty if make update was run):"
git diff --name-only HEAD -- ci-operator/jobs/openshift/rosa/ || true
echo
echo "Diff stat for generated jobs directory:"
git diff --stat HEAD -- ci-operator/jobs/openshift/rosa/ || true
echo
echo "Git status (for context):"
git status --porcelain || trueRepository: openshift/release
Length of output: 200
Regenerate and commit Prow job artifacts after job as: renames
The changes in ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml alter job identifiers (as:), so the generated YAMLs under ci-operator/jobs/openshift/rosa/ must be regenerated with make update and committed. The generated jobs directory has no corresponding updates.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@ci-operator/config/openshift/rosa/openshift-rosa-master__e2e.yaml` around
lines 25 - 432, The PR renames job identifiers in
openshift-rosa-master__e2e.yaml (see changed as: values such as
rosa-sts-advanced-f3, rosa-sts-shared-vpc-f3, rosa-hcp-shared-vpc-f3, etc.), but
the generated CI job artifacts were not updated; run the repository job artifact
regeneration (e.g., invoke the project's update target like make update or the
canonical job generation command) to regenerate the generated jobs from
openshift-rosa-master__e2e.yaml and commit the resulting generated YAMLs so the
ci-operator/jobs output matches the new as: names.
Source: Coding guidelines
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ROSACLI:
rosa-sts-advanced-prod-critical-high-f3rosa-hcp-advanced-prod-critical-high-f3rosa-sts-upgrade-y-stream-prod-f3rosa-sts-advanced-critical-high-f3+rosa-sts-advanced-medium-low-f7->rosa-sts-advanced-f3rosa-sts-shared-vpc-critical-high-f3+rosa-sts-shared-vpc-medium-low-f7->rosa-sts-shared-vpc-f3rosa-hcp-shared-vpc-critical-high-f3+rosa-hcp-shared-vpc-medium-low-f7->rosa-hcp-shared-vpc-f3rosa-hcp-external-auth-critical-high-f3+rosa-hcp-external-auth-medium-low-f7->rosa-hcp-external-auth-f3rosa-hcp-advanced-critical-high-f3+rosa-hcp-advanced-medium-low-f7->rosa-hcp-advanced-f3rosa-hcp-private-link-critical-high-f3->rosa-hcp-private-link-f3rosa-ocm-resources-f3+rosa-day1-negative-f7+rosa-day1-supplemental-f3->rosa-extra-f3Terraform Provider:
rosa-sts-advanced-critical-high-f3+rosa-sts-advanced-medium-low-f7->rosa-sts-advanced-f3rosa-sts-private-critical-high-f3+rosa-sts-private-medium-low-f7->rosa-sts-private-f3rosa-hcp-advanced-critical-high-f3+rosa-hcp-advanced-medium-low-f7->rosa-hcp-advanced-f3rosa-hcp-private-critical-high-f3+rosa-hcp-private-medium-low-f7->rosa-hcp-private-f3Summary by CodeRabbit
This PR consolidates and streamlines the OpenShift CI infrastructure for ROSA (Red Hat OpenShift on AWS) by reducing the number of periodic test jobs across the ROSA CLI and Terraform Provider components.
ROSA CLI Configuration Changes
The
openshift-rosa-master__e2e.yamlfile (437 lines) undergoes significant restructuring:Removed production environments: Three production-targeted test jobs are removed entirely:
rosa-sts-advanced-prod-critical-high-f3rosa-hcp-advanced-prod-critical-high-f3rosa-sts-upgrade-y-stream-prod-f3Merged test jobs: Multiple paired periodic jobs (split between "critical-high" and "medium-low" frequency variants) are consolidated into single jobs:
rosa-sts-advanced-critical-high-f3+rosa-sts-advanced-medium-low-f7→rosa-sts-advanced-f3rosa-sts-shared-vpc-critical-high-f3+rosa-sts-shared-vpc-medium-low-f7→rosa-sts-shared-vpc-f3rosa-hcp-shared-vpc-critical-high-f3+rosa-hcp-shared-vpc-medium-low-f7→rosa-hcp-shared-vpc-f3rosa-hcp-external-auth-critical-high-f3+rosa-hcp-external-auth-medium-low-f7→rosa-hcp-external-auth-f3rosa-hcp-advanced-critical-high-f3+rosa-hcp-advanced-medium-low-f7→rosa-hcp-advanced-f3rosa-hcp-private-link-critical-high-f3→rosa-hcp-private-link-f3Combined test categories: Three previously separate test jobs are merged into one:
rosa-ocm-resources-f3+rosa-day1-negative-f7+rosa-day1-supplemental-f3→rosa-extra-f3Slack reporting alignment: The reporter configuration is updated to use a standardized Slack message template, aligning with the Terraform Provider's notification format.
Terraform Provider Configuration Changes
The
terraform-redhat-terraform-provider-rhcs-main__e2e.yamlfile (487 lines) applies similar consolidation:Merged test jobs: Multiple test job pairs are consolidated into single variants:
rosa-sts-advanced-critical-high-f3+rosa-sts-advanced-medium-low-f7→rosa-sts-advanced-f3rosa-sts-private-critical-high-f3+rosa-sts-private-medium-low-f7→rosa-sts-private-f3rosa-hcp-advanced-critical-high-f3+rosa-hcp-advanced-medium-low-f7→rosa-hcp-advanced-f3rosa-hcp-private-critical-high-f3+rosa-hcp-private-medium-low-f7→rosa-hcp-private-f3Updated test filters: Case label filters are refined across various test configurations to ensure appropriate test scenarios are executed for each job variant.
Impact
This consolidation reduces operational overhead by reducing the number of periodic jobs that need to be maintained and monitored, while preserving test coverage through merged test configurations. The alignment of Slack message templates between ROSA CLI and Terraform Provider jobs improves consistency in CI/CD notifications.