Skip to content

Add optional 4.21 job for rhobs/observability-operator#79855

Closed
simonpasquier wants to merge 1 commit into
openshift:mainfrom
simonpasquier:add-on-demand-job-for-coo-4.21
Closed

Add optional 4.21 job for rhobs/observability-operator#79855
simonpasquier wants to merge 1 commit into
openshift:mainfrom
simonpasquier:add-on-demand-job-for-coo-4.21

Conversation

@simonpasquier

@simonpasquier simonpasquier commented May 29, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

This PR adds an optional, on-demand OpenShift CI e2e job for rhobs/observability-operator targeting OpenShift 4.21 on Azure.

What changed in practical terms:

  • Added a new ci-operator test entry in ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml:
    • Job: as: observability-operator-e2e
    • Marked optional: true and always_run: false (manual/on-demand)
    • Uses cluster_profile: azure-observability and workflow: cucushift-installer-rehearse-azure-ipi

What the job does / practical impact:

  • Provides a manual e2e validation path for the Observability Operator on OCP 4.21 (Azure).
  • Sets environment variables: BASE_DOMAIN, CYPRESS_COO_NAMESPACE, MULTISTAGE_PARAM_OVERRIDE_COO_INDEX_IMAGE.
  • Defines an OPERATORS install matrix including: cluster-observability-operator, tempo-product, opentelemetry-product, advanced-cluster-management, and lightspeed-operator.
  • Runs an ordered set of test refs (catalogsource, ACM setup/patch, install-operators, COO readiness, ACM observability, alerting UI, tracing UI integration, monitoring-plugin monitoring-incidents UI integration, and rhobs-obo-test-harness).

Areas affected:

  • CI configuration for rhobs/observability-operator (adds a 4.21 Azure optional e2e job consistent with other release configs).

@coderabbitai

coderabbitai Bot commented May 29, 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: 127543a7-45e8-4562-93e9-dda170f70019

📥 Commits

Reviewing files that changed from the base of the PR and between a516773 and 1991948.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/rhobs/observability-operator/rhobs-observability-operator-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml

Walkthrough

Adds a new observability-operator-e2e CI test entry to the rhobs observability-operator Azure OCP 4.21 configuration, specifying cluster_profile: azure-observability, environment variables, an OPERATORS install list, ordered test refs, and the cucushift-installer-rehearse-azure-ipi workflow.

Changes

Azure OCP 4.21 e2e test configuration

Layer / File(s) Summary
Azure OCP 4.21 e2e test entry
ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml
Inserts a new tests item observability-operator-e2e with always_run: false, optional: true, cluster_profile: azure-observability, required env vars (BASE_DOMAIN, CYPRESS_COO_NAMESPACE, MULTISTAGE_PARAM_OVERRIDE_COO_INDEX_IMAGE), an OPERATORS install list, an ordered list of test refs, and the cucushift-installer-rehearse-azure-ipi workflow.
sequenceDiagram
  participant CI-Operator
  participant RehearseWorkflow
  participant AzureCluster
  participant TestHarness
  CI-Operator->>RehearseWorkflow: trigger cucushift-installer-rehearse-azure-ipi (observability-operator-e2e)
  RehearseWorkflow->>AzureCluster: provision cluster_profile=azure-observability + env vars
  RehearseWorkflow->>TestHarness: run ordered test refs and operator installs
Loading

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • openshift/release#75225: Modifies the same rhobs Azure tests list and inserts test refs affecting CI test ordering/content.

Suggested labels

rehearsals-ack

Suggested reviewers

  • slashpai
🚥 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 concisely summarizes the main change: adding an optional CI job for OpenShift 4.21 to the observability-operator configuration.
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 adds CI configuration only; no Ginkgo test code (It/Describe/Context statements) is modified or introduced, so the check for stable test names is not applicable.
Test Structure And Quality ✅ Passed PR adds CI configuration files (YAML), not Ginkgo test code. The check for Ginkgo test code quality is not applicable to this CI configuration-only PR.
Microshift Test Compatibility ✅ Passed This PR only modifies CI configuration files (YAML), not Ginkgo test code. The check is for new Ginkgo e2e tests (It(), Describe(), Context(), etc.) but no new test code is added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR adds CI job configuration (YAML), not new Ginkgo e2e tests. The check applies only to new Ginkgo test code with patterns like It(), Describe(), etc., which are not present in this change.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies a CI operator config file, not deployment manifests, operator code, or controllers. No scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR adds CI configuration YAML files only, not OTE test binary source code. Custom check for stdout violations doesn't apply to CI configuration files.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR adds CI configuration only (YAML file), not new Ginkgo e2e test code. Check only applies to new Ginkgo tests with It(), Describe(), etc.
No-Weak-Crypto ✅ Passed The PR adds only a CI/CD configuration YAML file with no cryptographic implementations, weak crypto algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), or insecure secret comparisons.
Container-Privileges ✅ Passed No privileged container settings found. File is a CI-Operator configuration that does not define container security contexts or Kubernetes manifests with privilege escalation.
No-Sensitive-Data-In-Logs ✅ Passed No sensitive data (passwords, tokens, API keys, PII, session IDs, internal hostnames, or customer data) found in the CI configuration file changes.

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

openshift-ci Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: simonpasquier

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

@openshift-ci 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 openshift-ci Bot requested review from marioferh and slashpai May 29, 2026 07:08
@simonpasquier

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@simonpasquier

Copy link
Copy Markdown
Contributor Author

/cc @DavidRajnoha @jan--f

@openshift-ci openshift-ci Bot requested review from DavidRajnoha and jan--f May 29, 2026 07:13

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml (1)

70-95: ⚖️ Poor tradeoff

Consider reducing code duplication with the coo-stage test.

The new test entry duplicates most configuration from the existing coo-stage test (lines 33-69):

  • Identical cluster_profile, env variables (including the full OPERATORS matrix), and workflow
  • Nearly identical test ref sequence (except for the missing rhobs-wait-for-coo-ready ref noted above)

While duplication in CI configs is common for explicitness, consider whether YAML anchors or a shared base configuration could reduce maintenance burden if these tests need to stay in sync.

🤖 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/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml`
around lines 70 - 95, The new job observability-operator-e2e-4-21 duplicates
most of coo-stage (cluster_profile, env, OPERATORS, test refs, workflow);
refactor by extracting the shared config into a reusable YAML anchor or a shared
base block and reference it from observability-operator-e2e-4-21 (keep only the
differing bits like name and any missing refs such as rhobs-wait-for-coo-ready
if needed), ensuring you reuse the cluster_profile, env (including OPERATORS),
test list and workflow keys to avoid duplication.
🤖 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/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml`:
- Line 70: The job entry that declares "as: observability-operator-e2e-4-21"
currently sets "always_run: false" but omits "optional: true", creating
inconsistent intent; update the job definition by adding "optional: true"
alongside "always_run: false" so the 4.21 job is non-blocking (or if the job
should block, set "always_run: true" instead)—locate the job with the "as:
observability-operator-e2e-4-21" identifier and add the "optional: true" field
to its configuration.

---

Nitpick comments:
In
`@ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml`:
- Around line 70-95: The new job observability-operator-e2e-4-21 duplicates most
of coo-stage (cluster_profile, env, OPERATORS, test refs, workflow); refactor by
extracting the shared config into a reusable YAML anchor or a shared base block
and reference it from observability-operator-e2e-4-21 (keep only the differing
bits like name and any missing refs such as rhobs-wait-for-coo-ready if needed),
ensuring you reuse the cluster_profile, env (including OPERATORS), test list and
workflow keys to avoid duplication.
🪄 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: 047b4e0b-180b-4a72-a1e2-095813051e66

📥 Commits

Reviewing files that changed from the base of the PR and between 5700bb6 and 27cffcb.

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/rhobs/observability-operator/rhobs-observability-operator-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (1)
  • ci-operator/config/rhobs/observability-operator/rhobs-observability-operator-main__amd64-ocp-4.21-azure.yaml

@simonpasquier

Copy link
Copy Markdown
Contributor Author

/hold

@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 May 29, 2026
@simonpasquier simonpasquier force-pushed the add-on-demand-job-for-coo-4.21 branch from 27cffcb to a516773 Compare May 29, 2026 08:18
@simonpasquier

Copy link
Copy Markdown
Contributor Author

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@DavidRajnoha

Copy link
Copy Markdown
Contributor

@simonpasquier can you also include - ref: monitoring-plugin-tests-monitoring-incidents-ui-integration (https://github.com/openshift/release/pull/75225/changes)

@simonpasquier

Copy link
Copy Markdown
Contributor Author

/hold

Let's put a hold on this one until your PR merges.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier force-pushed the add-on-demand-job-for-coo-4.21 branch from a516773 to 1991948 Compare May 29, 2026 14:30
@simonpasquier

Copy link
Copy Markdown
Contributor Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 29, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@simonpasquier: 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-rhobs-observability-operator-main-amd64-ocp-4.21-azure-observability-operator-e2e rhobs/observability-operator presubmit Presubmit 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

openshift-ci Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

@simonpasquier: 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/rhobs/observability-operator/main/amd64-ocp-4.21-azure-observability-operator-e2e a516773 link unknown /pj-rehearse pull-ci-rhobs-observability-operator-main-amd64-ocp-4.21-azure-observability-operator-e2e

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.

@simonpasquier

Copy link
Copy Markdown
Contributor Author

updated with latest main

@simonpasquier

Copy link
Copy Markdown
Contributor Author

/close

not the right approach: if we want to run the e2e tests against a PR, Prow needs to build the operator image and install it in the test cluster.

@openshift-ci openshift-ci Bot closed this Jun 4, 2026
@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

@simonpasquier: Closed this PR.

Details

In response to this:

/close

not the right approach: if we want to run the e2e tests against a PR, Prow needs to build the operator image and install it in the test cluster.

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.

@simonpasquier simonpasquier deleted the add-on-demand-job-for-coo-4.21 branch June 4, 2026 08:22
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants