Skip to content

Sync downstream ovnk payload configs... #79999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 3, 2026
Merged

Sync downstream ovnk payload configs... #79999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,18 +384,24 @@ tests:
steps:
cluster_profile: aws-perfscale-qe
env:
ADDITIONAL_WORKER_NODES: "3"
BASE_DOMAIN: qe.devcluster.openshift.com
CD_V2_EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s --service-latency
CDV2_ITERATION_MULTIPLIER: "15"
COMPUTE_NODE_REPLICAS: "6"
ENABLE_LOCAL_INDEX: "true"
ENABLE_LAYER_3: "false"
ES_TYPE: qe
EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
IGNORE_JOB_ITERATIONS: "true"
KB_FLAGS: --local-indexing
ND_CNI_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50
--churn-cycles=2
ND_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50 --churn-cycles=2
OUTPUT_FORMAT: JUNIT
RUN_ORION: "false"
UDN_ITERATION_MULTIPLIER: "12"
VERSION: "4.22"
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Jun 2, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

VERSION mismatch: should be "5.0" for main branch.

The main branch is configured to promote to "5.0" (line 28), and the releases section references "5.0" (lines 33-34, 38-39). However, this test job still uses VERSION: "4.22". For consistency with the branch configuration and to match the pattern in the release-5.0.yaml file (which correctly uses VERSION: "5.0"), this should be updated.

Proposed fix 
-      VERSION: "4.22"
+      VERSION: "5.0"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
VERSION: "4.22"
VERSION: "5.0"
🤖 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/ovn-kubernetes/openshift-ovn-kubernetes-main.yaml`
at line 401, The VERSION setting in the job YAML is incorrect: update the
VERSION key value from "4.22" to "5.0" so the test job matches the main-branch
promotion and releases configuration; locate the VERSION: "4.22" entry in the
openshift-ovn-kubernetes-main.yaml job and replace it with VERSION: "5.0".

Copy link
Copy Markdown
Contributor Author

@afcollins afcollins Jun 2, 2026

Choose a reason for hiding this comment

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

I agree, but this is out of the scope of the PR changes.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Jun 2, 2026

Choose a reason for hiding this comment

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

@afcollins, understood — thanks for confirming it's a valid concern. Would you like me to open a follow-up GitHub issue to track updating VERSION: "4.22" → VERSION: "5.0" in the qe-perfscale-payload-control-plane-6nodes job in openshift-ovn-kubernetes-main.yaml?

🧠 Learnings used 
Learnt from: PillaiManish
Repo: openshift/release PR: 79231
File: ci-operator/config/openshift/secrets-store-csi-driver-operator/openshift-secrets-store-csi-driver-operator-main.yaml:0-0
Timestamp: 2026-05-20T05:41:25.164Z
Learning: When reviewing OpenShift/Kubernetes operator manifests/CSVs, if a ClusterServiceVersion (CSV) defines an `emptyDir` volume mounted at `/tmp` with `medium: Memory`, treat that data as scoped to the *pod lifecycle* (not the container lifecycle). Container restarts within the same pod (e.g., restart after SIGTERM/termination and recreation of the container) should not wipe the `emptyDir` contents; data written to something like `/tmp/e2e-cover` should still be present and can be collected afterward (e.g., via `oc cp`). The `emptyDir` is cleared when the pod is deleted/recreated/rescheduled (pod lifecycle ends), not on container restarts.

Learnt from: rdiscala
Repo: openshift/release PR: 79357
File: ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-sno-day2-worker-4.18.yaml:23-23
Timestamp: 2026-05-20T11:54:20.424Z
Learning: In the openshift/release repository CI operator configuration YAMLs, do not treat an intentionally impossible cron schedule (e.g., `0 0 31 2 *` for “Feb 31”) as a misconfiguration. This pattern is an intentional mechanism used to disable/park a periodic CI job temporarily (e.g., while an upstream bug is being fixed). Only flag cron syntax errors when the schedule is not an intentional “impossible date” disable pattern used for job parking.

Learnt from: dhaiducek
Repo: openshift/release PR: 79563
File: ci-operator/config/stolostron/cluster-proxy/stolostron-cluster-proxy-main.yaml:41-43
Timestamp: 2026-05-20T19:31:57.286Z
Learning: In the openshift/release repo, for ci-operator container test step config YAML files under ci-operator/config/, remember that the `commands` field is read by ci-operator at runtime from the config YAML and is not embedded into the generated ProwJob YAML under `ci-operator/jobs/`. Therefore, if a PR changes only `commands` (and not any ProwJob-spec affecting structural fields such as test/job names, job types/spec, or metadata that changes the resulting ProwJob spec), you generally do NOT need to run `make update` and regenerating artifacts should be a no-op diff. Run `make update` only when the changes affect the generated ProwJob spec (e.g., new/renamed tests, new job types, or other spec/metadata changes that alter `ci-operator/jobs/` output).

Learnt from: tthvo
Repo: openshift/release PR: 79564
File: ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-nightly-4.19.yaml:94-94
Timestamp: 2026-05-20T20:01:14.481Z
Learning: In the openshift/release repo, when editing ci-operator config YAMLs under ci-operator/config/, changes that only modify the *values* of environment variables inside test step `env` blocks (e.g., COMPUTE_NODE_TYPE, ADDITIONAL_WORKER_VM_TYPE, MIGRATION_INFRA_MACHINE_TYPE) do not change the generated ProwJob specs under ci-operator/jobs/. For these value-only env tweaks, reviewers should not require running `make update` because it should produce no diff. Require `make update` only for structural/semantic changes that can affect the generated ProwJob spec (e.g., adding/renaming tests, changing job types, or altering metadata/fields that feed into the ProwJob spec).

Learnt from: karampok
Repo: openshift/release PR: 79537
File: ci-operator/config/openshift/bond-cni/openshift-bond-cni-main.yaml:32-33
Timestamp: 2026-05-21T09:04:21.025Z
Learning: In openshift/release, when modifying a ci-operator config YAML under ci-operator/config/ by adding an `env` block (key/value environment variables such as `TEST_TYPE`, `TEST_SUITE`, `TEST_ARGS`) to an existing test step, this change does not affect the generated ProwJob specs under ci-operator/jobs/. In this case, `make update` is a no-op—do not request or flag that `make update` was (or needs to be) run for these env-only edits.

Learnt from: feichashao
Repo: openshift/release PR: 79740
File: ci-operator/config/openshift/backplane-cli/openshift-backplane-cli-main.yaml:2-10
Timestamp: 2026-05-27T06:35:08.802Z
Learning: In the openshift/release repo, for ci-operator config YAMLs under `ci-operator/config/`, changes that only modify these fields do not require running `make update` or regenerating ProwJob spec YAMLs under `ci-operator/jobs/`: `base_images` and `build_root.image_stream_tag`. These values are read by ci-operator at runtime and are not embedded into the generated ProwJob specs. Only “structural/semantic” changes that would change the resulting ProwJob specs themselves (e.g., adding/renaming tests, changing job types, or changing metadata that feeds into the ProwJob spec) require `make update`.

Learnt from: sivaramsingana
Repo: openshift/release PR: 79753
File: ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-421-s390x-quay.yaml:1-41
Timestamp: 2026-05-27T11:27:23.893Z
Learning: In the openshift/release repo, for CI-operator configuration YAMLs located under `ci-operator/config/`, do not require `images` or `promotion` sections when the configuration is test-only and does not build any new container images. 
- Include `images` only if the config actually builds new images.
- Include `promotion` only if any built images must be promoted.
- Test-only configs that only consume `base_images` in `workflow/test` steps (and do not build new images) should be considered complete without `images` or `promotion`.

Learnt from: rafabene
Repo: openshift/release PR: 79722
File: ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-main__e2e.yaml:28-28
Timestamp: 2026-05-27T14:34:48.023Z
Learning: When reviewing `ci-operator` presubmit test YAMLs in `ci-operator/config/**/*.yaml`, do NOT automatically flag `skip_if_only_changed: .` as a misconfiguration. In this repo it can be an intentional pattern for “manual-only” presubmit jobs that are designed to run only when explicitly requested (e.g., triggered via `/test <job-name>`, similar to `pj-rehearse`) rather than auto-running on every PR. Only flag `skip_if_only_changed: .` if the surrounding job configuration does not indicate it is meant to be a manually triggered presubmit.

Learnt from: LuboTerifaj
Repo: openshift/release PR: 79928
File: ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-5.0__automated-release-stable-5.0-upgrade-from-stable-5.0.yaml:46-62
Timestamp: 2026-06-02T10:55:27.606Z
Learning: In the openshift/release repo’s ci-operator config YAMLs, the `relative` field is valid when used inside a `prerelease` release block (it is not limited to `candidate` blocks). If you see `relative` set under `prerelease` (e.g., `relative: 1`), do not flag it as a schema violation. Reviewers should treat this as the standard OpenShift incremental z-stream upgrade testing pattern where `ci-operator` uses `relative` to append `&rel=<N>` to the release API request, selecting the Nth build position within the configured `version_bounds` (e.g., `5.0.0-ec.1` → `5.0.0-ec.2`).

Learnt from: smg247
Repo: openshift/release PR: 79989
File: ci-operator/config/openshift/sippy/openshift-sippy-main.yaml:21-22
Timestamp: 2026-06-02T17:01:07.630Z
Learning: In this repo, when reviewing ci-operator config YAMLs under `ci-operator/config/`, treat `dockerfile_path` entries as paths resolved relative to the upstream source repository being tested (e.g., `openshift/sippy`), not relative to the `openshift/release` repo clone. Do not flag `dockerfile_path` as missing/broken just because the referenced file is not present in the `openshift/release` checkout; verify the Dockerfile exists in the upstream source repo referenced by the test configuration before raising a finding.

Learnt from: smg247
Repo: openshift/release PR: 79989
File: ci-operator/config/openshift/sippy/openshift-sippy-main.yaml:21-29
Timestamp: 2026-06-02T17:01:09.558Z
Learning: In openshift/release, for ci-operator config YAMLs under ci-operator/config/, changes limited to the `images` and/or `promotion` sections (including adding/removing image build entries or promotion targets) should not trigger running `make update` or regenerating ProwJob spec YAMLs under ci-operator/jobs/. `ci-operator` reads `images` and `promotion` directly from these config YAMLs at runtime, and those fields are not embedded into the generated ProwJob specs. Only changes that affect ProwJob spec generation/structure (e.g., adding/renaming tests, changing job types, or modifying metadata that feeds into ProwJob spec generation) require `make update` and regenerated ProwJob YAMLs.

ZONES_COUNT: "3"
test:
- ref: openshift-qe-workers-scale
- chain: openshift-qe-control-plane
- chain: openshift-qe-orion-consolidated
workflow: openshift-qe-installer-aws
Expand Down
11 changes: 8 additions & 3 deletions ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,24 @@ tests:
steps:
cluster_profile: aws-perfscale-qe
env:
ADDITIONAL_WORKER_NODES: "3"
BASE_DOMAIN: qe.devcluster.openshift.com
CD_V2_EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s --service-latency
CDV2_ITERATION_MULTIPLIER: "15"
COMPUTE_NODE_REPLICAS: "6"
ENABLE_LAYER_3: "false"
ENABLE_LOCAL_INDEX: "true"
ES_TYPE: qe
EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
IGNORE_JOB_ITERATIONS: "true"
KB_FLAGS: --local-indexing
ND_CNI_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50
--churn-cycles=2
ND_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50 --churn-cycles=2
OUTPUT_FORMAT: JUNIT
RUN_ORION: "false"
UDN_ITERATION_MULTIPLIER: "12"
VERSION: "4.21"
ZONES_COUNT: "3"
test:
- ref: openshift-qe-workers-scale
- chain: openshift-qe-control-plane
- chain: openshift-qe-orion-consolidated
workflow: openshift-qe-installer-aws
Expand Down
12 changes: 9 additions & 3 deletions ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,18 +382,24 @@ tests:
steps:
cluster_profile: aws-perfscale-qe
env:
ADDITIONAL_WORKER_NODES: "3"
BASE_DOMAIN: qe.devcluster.openshift.com
CD_V2_EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s --service-latency
CDV2_ITERATION_MULTIPLIER: "15"
COMPUTE_NODE_REPLICAS: "6"
ENABLE_LOCAL_INDEX: "true"
ENABLE_LAYER_3: "false"
ES_TYPE: qe
EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
IGNORE_JOB_ITERATIONS: "true"
KB_FLAGS: --local-indexing
ND_CNI_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50
--churn-cycles=2
ND_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50 --churn-cycles=2
OUTPUT_FORMAT: JUNIT
RUN_ORION: "false"
UDN_ITERATION_MULTIPLIER: "12"
VERSION: "4.22"
ZONES_COUNT: "3"
test:
- ref: openshift-qe-workers-scale
- chain: openshift-qe-control-plane
- chain: openshift-qe-orion-consolidated
workflow: openshift-qe-installer-aws
Expand Down
14 changes: 10 additions & 4 deletions ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-4.23.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,18 +362,24 @@ tests:
steps:
cluster_profile: aws-perfscale-qe
env:
ADDITIONAL_WORKER_NODES: "3"
BASE_DOMAIN: qe.devcluster.openshift.com
CD_V2_EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s --service-latency
CDV2_ITERATION_MULTIPLIER: "15"
COMPUTE_NODE_REPLICAS: "6"
ENABLE_LOCAL_INDEX: "true"
ENABLE_LAYER_3: "false"
ES_TYPE: qe
EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
IGNORE_JOB_ITERATIONS: "true"
KB_FLAGS: --local-indexing
ND_CNI_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50
--churn-cycles=2
ND_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50 --churn-cycles=2
OUTPUT_FORMAT: JUNIT
RUN_ORION: "false"
UDN_ITERATION_MULTIPLIER: "12"
VERSION: "4.22"
VERSION: "4.23"
ZONES_COUNT: "3"
test:
- ref: openshift-qe-workers-scale
- chain: openshift-qe-control-plane
- chain: openshift-qe-orion-consolidated
workflow: openshift-qe-installer-aws
Expand Down
13 changes: 10 additions & 3 deletions ci-operator/config/openshift/ovn-kubernetes/openshift-ovn-kubernetes-release-5.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,18 +363,25 @@ tests:
steps:
cluster_profile: aws-perfscale-qe
env:
ADDITIONAL_WORKER_NODES: "3"
BASE_DOMAIN: qe.devcluster.openshift.com
CD_V2_EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s --service-latency
CDV2_ITERATION_MULTIPLIER: "15"
COMPUTE_NODE_REPLICAS: "6"
ENABLE_LAYER_3: "false"
ENABLE_LOCAL_INDEX: "true"
ES_TYPE: qe
EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
IGNORE_JOB_ITERATIONS: "true"
KB_FLAGS: --local-indexing
ND_CNI_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50
--churn-cycles=2
ND_EXTRA_FLAGS: --churn-mode=objects --churn-delay=1m --churn-percent=50 --churn-cycles=2
OUTPUT_FORMAT: JUNIT
RUN_ORION: "false"
UDN_ITERATION_MULTIPLIER: "12"
VERSION: "4.22"
VERSION: "5.0"
ZONES_COUNT: "3"
test:
- ref: openshift-qe-workers-scale
- chain: openshift-qe-control-plane
- chain: openshift-qe-orion-consolidated
workflow: openshift-qe-installer-aws
Expand Down