Skip to content

Pre branching 5.0 -> 5.1 #83050

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-robot merged 3 commits into from
Aug 6, 2026
Merged

Pre branching 5.0 -> 5.1 #83050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
904cada
pre-branching-step-1-rpm-mirroring-5.1
deepsm007 Aug 6, 2026
18377ae
pre-branching-step-2-release-gating-5.1
deepsm007 Aug 6, 2026
5ee5c93
pre-branching-step-3-release-controller-5.1
deepsm007 Aug 6, 2026
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
202 changes: 202 additions & 0 deletions ...observ-perf-tests/netobserv-netobserv-perf-tests-main__netobserv-aws-5.1-nightly-x86.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
base_images:
cerberus.prow:
name: cerberus
namespace: chaos
tag: cerberus-prow
cli:
name: "5.1"
namespace: ocp
tag: cli
flowlogs-pipeline:
name: flowlogs-pipeline
namespace: netobserv
tag: ci
netobserv-ebpf-agent:
name: netobserv-ebpf-agent
namespace: netobserv
tag: ci
netobserv-perfscale:
name: netobserv-perfscale
namespace: ci
tag: latest
ocp-qe-perfscale-ci:
name: ocp-qe-perfscale-ci
namespace: ci
tag: latest
build_root:
image_stream_tag:
name: ci-tools-build-root
namespace: ci
tag: latest
images:
items:
- dockerfile_literal: FROM cerberus.prow
from: cerberus.prow
to: perfscale-observer
releases:
latest:
candidate:
product: ocp
stream: nightly
version: "5.1"
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: node-density-heavy-25nodes
cron: 48 14 1 * *
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale-qe
dependencies:
EBPFAGENT_PR_IMAGE: ""
FLP_PR_IMAGE: ""
env:
ACK_FILE: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/orion/ack.yaml
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "25"
COMPUTE_NODE_TYPE: m6i.4xlarge
DISPLAY: noo_bundle_info
ES_BENCHMARK_INDEX: prod-netobserv-datapoints*
ES_METADATA_INDEX: perf_scale_ci*
ES_TYPE: qe
EXTRA_FLAGS: --es-index=ripsaw-kube-burner --metrics-profile metrics-aggregated.yml
EXTRA_MG_ARGS: --image=quay.io/netobserv/must-gather
FLP_CONSUMER_REPLICAS: "6"
LOKISTACK_SIZE: 1x.small
LOOKBACK: "60"
LOOKBACK_SIZE: "15"
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge
ORION_CONFIG: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/queries/netobserv-orion.yaml
ORION_ENVS: PLATFORM=AWS,WORKERS=25,WORKLOAD=node-density-heavy,deployment_model=Kafka
PATCH_EBPFAGENT_IMAGE: "false"
PATCH_FLOWLOGS_IMAGE: "false"
PODS_PER_NODE: "200"
RUN_ORION: "true"
SIZE_VARIANT: large
VERSION: "5.1"
WAIT_EXPRESSION: oc get flowcollector cluster --no-headers 2>/dev/null | grep
-c 'Ready'
WORKLOAD: node-density-heavy
ZONES_COUNT: "3"
observers:
enable:
- redhat-chaos-cerberus
post:
- ref: netobserv-cerberus-report
- chain: netobserv-perf-test-post
test:
- ref: redhat-chaos-observer-start
- ref: netobserv-perf-test-deploy
- ref: openshift-qe-kube-burner-ingress-perf
- chain: netobserv-perf-test-post-workload
- ref: openshift-qe-orion
workflow: openshift-qe-installer-aws
- as: node-density-heavy-25nodes-service-without-loki
cron: 48 14 2 * *
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale-qe
dependencies:
EBPFAGENT_PR_IMAGE: ""
FLP_PR_IMAGE: ""
env:
ACK_FILE: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/orion/ack.yaml
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "25"
COMPUTE_NODE_TYPE: m6i.4xlarge
DEPLOYMENT_MODEL: Service
DISPLAY: noo_bundle_info
ES_BENCHMARK_INDEX: prod-netobserv-datapoints*
ES_METADATA_INDEX: perf_scale_ci*
ES_TYPE: qe
EXTRA_FLAGS: --es-index=ripsaw-kube-burner --metrics-profile metrics-aggregated.yml
EXTRA_MG_ARGS: --image=quay.io/netobserv/must-gather
FLP_CONSUMER_REPLICAS: "6"
LOKI_OPERATOR: None
LOOKBACK: "30"
LOOKBACK_SIZE: "15"
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge
ORION_CONFIG: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/queries/netobserv-orion-node-density-heavy-service.yaml
ORION_ENVS: PLATFORM=AWS,WORKERS=25,WORKLOAD=node-density-heavy,deployment_model=Service
PATCH_EBPFAGENT_IMAGE: "false"
PATCH_FLOWLOGS_IMAGE: "false"
PODS_PER_NODE: "200"
RUN_ORION: "true"
SIZE_VARIANT: large
VERSION: "5.1"
WAIT_EXPRESSION: oc get flowcollector cluster --no-headers 2>/dev/null | grep
-c 'Ready'
WORKLOAD: node-density-heavy
ZONES_COUNT: "3"
observers:
enable:
- redhat-chaos-cerberus
post:
- ref: netobserv-cerberus-report
- chain: netobserv-perf-test-post
test:
- ref: redhat-chaos-observer-start
- ref: netobserv-perf-test-deploy
- ref: openshift-qe-kube-burner-ingress-perf
- chain: netobserv-perf-test-post-workload
- ref: openshift-qe-orion
workflow: openshift-qe-installer-aws
- as: cluster-density-v2-250nodes
cron: 48 14 3 * *
steps:
allow_skip_on_success: true
cluster_profile: aws-perfscale-qe
dependencies:
EBPFAGENT_PR_IMAGE: ""
FLP_PR_IMAGE: ""
env:
ACK_FILE: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/orion/ack.yaml
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "250"
COMPUTE_NODE_TYPE: m6i.4xlarge
DISPLAY: noo_bundle_info
ES_BENCHMARK_INDEX: prod-netobserv-datapoints*
ES_METADATA_INDEX: perf_scale_ci*
ES_TYPE: qe
EXTRA_FLAGS: --churn-delay=60s --churn-duration=10m --churn-percent=10 --timeout=5h
--es-index=ripsaw-kube-burner --metrics-profile metrics-aggregated.yml
EXTRA_MG_ARGS: --image=quay.io/netobserv/must-gather
FLP_CONSUMER_REPLICAS: "18"
ITERATION_MULTIPLIER_ENV: "4"
LOKISTACK_SIZE: 1x.medium
LOOKBACK: "60"
LOOKBACK_SIZE: "15"
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge
ORION_CONFIG: https://raw.githubusercontent.com/netobserv/netobserv-perf-tests/refs/heads/main/scripts/queries/netobserv-orion.yaml
ORION_ENVS: PLATFORM=AWS,WORKERS=250,WORKLOAD=cluster-density-v2,deployment_model=Kafka
PATCH_EBPFAGENT_IMAGE: "false"
PATCH_FLOWLOGS_IMAGE: "false"
RUN_ORION: "true"
SIZE_VARIANT: large
VERSION: "5.1"
WAIT_EXPRESSION: oc get flowcollector cluster --no-headers 2>/dev/null | grep
-c 'Ready'
WORKLOAD: cluster-density-v2
ZONES_COUNT: "3"
observers:
enable:
- redhat-chaos-cerberus
post:
- ref: netobserv-cerberus-report
- chain: netobserv-perf-test-post
test:
- ref: redhat-chaos-observer-start
- ref: netobserv-perf-test-deploy
- ref: openshift-qe-kube-burner-ingress-perf
- chain: netobserv-perf-test-post-workload
- ref: openshift-qe-orion
workflow: openshift-qe-installer-aws
timeout: 8h0m0s
zz_generated_metadata:
branch: main
org: netobserv
repo: netobserv-perf-tests
variant: netobserv-aws-5.1-nightly-x86
73 changes: 73 additions & 0 deletions ...ator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
base_images:
cli:
name: "5.1"
namespace: ocp
tag: cli
openshift-virtualization-tests:
name: openshift-virtualization-tests
namespace: ci
tag: latest
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.21-openshift-4.18
images:
items:
- build_args:
- name: OCP_VERSION
value: "5.1"
- name: OC_CLI_VERSION
value: latest
context_dir: hack
dockerfile_path: Dockerfile.test.src.ci
to: cnv-ci
Comment on lines +17 to +24

@coderabbitai coderabbitai Bot Aug 6, 2026

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.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Find residual 5.0 literals inside files whose name targets 5.1.
fd -t f -e yaml . ci-operator/config | rg '5\.1|5-1' | while IFS= read -r f; do
  if rg -n '5\.0|5-0|5_0' "$f" >/dev/null 2>&1; then
    echo "=== $f"
    rg -n '5\.0|5-0|5_0' "$f"
  fi
done

Repository: openshift/release

Length of output: 13641

🏁 Script executed:

#!/bin/bash
set -u

files=(
  ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml
)

for f in "${files[@]}"; do
  echo "=== $f"
  sed -n '1,55p' "$f"
  if [[ "$f" == *cnv-ci* ]]; then
    echo "--- matching CNV 5.0/5.1 files"
    fd -t f -e yaml . ci-operator/config/openshift-cnv/cnv-ci | rg 'ocp5\.(0|1)|cnv-odf'
  else
    echo "--- matching agent 5.0/5.1 files"
    fd -t f -e yaml . ci-operator/config/openshift-eng/agent-qe-infra | rg 'release-5\.(0|1).*amd64-nightly'
    sed -n '790,840p' "$f"
  fi
done

echo "=== CNV 5.0 references and 5.1 release metadata"
rg -n -C 3 'OCP_VERSION|channel:|releases:|5\.0|5-0|5\.1|5-1' \
  ci-operator/config/openshift-cnv/cnv-ci ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml

Repository: openshift/release

Length of output: 50374

🏁 Script executed:

#!/bin/bash
set -u

files=(
  ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml
)

for f in "${files[@]}"; do
  echo "=== $f"
  sed -n '1,55p' "$f"
  if [[ "$f" == *cnv-ci* ]]; then
    echo "--- matching CNV 5.0/5.1 files"
    fd -t f -e yaml . ci-operator/config/openshift-cnv/cnv-ci | rg 'ocp5\.(0|1)|cnv-odf'
  else
    echo "--- matching agent 5.0/5.1 files"
    fd -t f -e yaml . ci-operator/config/openshift-eng/agent-qe-infra | rg 'release-5\.(0|1).*amd64-nightly'
    sed -n '790,840p' "$f"
  fi
done

echo "=== CNV 5.0 references and 5.1 release metadata"
rg -n -C 3 'OCP_VERSION|channel:|releases:|5\.0|5-0|5\.1|5-1' \
  ci-operator/config/openshift-cnv/cnv-ci \
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml

Repository: openshift/release

Length of output: 50374

🏁 Script executed:

#!/bin/bash
set -u

echo "=== CNV release channel names"
rg -n --glob '*.yaml' "cnv-release-[0-9]+-[0-9]+-z|cnv-release-5" ci-operator/config/openshift-cnv ci-operator/config | head -120

echo "=== CNV 5.0 and 5.1 targeted values"
for f in \
  ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.0-konflux.yaml \
  ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml; do
  echo "--- $f"
  rg -n 'name: OCP_VERSION|value: "[45]\.[01]"|channel:|CNV_VERSION|OCP_VERSION|version:' "$f"
done

echo "=== Agent 5.0/5.1 ISO values"
for f in \
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.0__amd64-nightly.yaml \
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml; do
  echo "--- $f"
  rg -n -C 3 'AGENT_ISO|agent-ove-[45]\.[01]\.x86_64\.iso' "$f"
done

echo "=== All agent OVE ISO references"
rg -n --glob '*.yaml' 'AGENT_ISO:|agent-ove-[0-9]+\.[0-9]+\.x86_64\.iso' ci-operator/config | head -120

echo "=== Remaining 5.0 literals in the two target files, with nearby keys"
rg -n -C 2 '5\.0|5-0|5_0' \
  ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml \
  ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml

Repository: openshift/release

Length of output: 7627

Update the 5.1-specific values in the copied configurations. Set OCP_VERSION to "5.1", use #cnv-release-5-1-z, and set AGENT_ISO to agent-ove-5.1.x86_64.iso at the listed locations.

📍 Affects 2 files
  • ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml#L17-L24 (this comment)
  • ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml#L40-L40
  • ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml#L810-L827
🤖 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-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml`
around lines 17 - 24, The copied 5.1 configurations still contain 5.0-specific
values. In
ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__cnv-odf-ocp5.1-konflux.yaml:17-24,
update OCP_VERSION to "5.1"; also update the release reference at line 40 to
`#cnv-release-5-1-z`. In
ci-operator/config/openshift-eng/agent-qe-infra/openshift-eng-agent-qe-infra-release-5.1__amd64-nightly.yaml:810-827,
set AGENT_ISO to agent-ove-5.1.x86_64.iso.

releases:
latest:
candidate:
product: ocp
stream: nightly
version: "5.1"
resources:
'*':
requests:
cpu: 200m
memory: 400Mi
tests:
- as: smoke
cron: 0 23 31 2 *
reporter_config:
channel: '#cnv-release-5-1-z'
job_states_to_report:
- success
- failure
- error
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs>
{{end}}'
steps:
cluster_profile: aws-interop-qe
env:
AWS_REGION_OVERWRITE: us-east-1
BASE_DOMAIN: release-ci.cnv-qe.rhood.us
CNV_VERSION: "5.1"
COMPUTE_NODE_TYPE: m8i.4xlarge
OCP_VERSION: "5.1"
ODF_OPERATOR_CHANNEL: stable-4.23
ODF_VERSION_MAJOR_MINOR: "4.23"
USER_TAGS: |
scenario cnv
tests-tier smoke
test:
- chain: cucushift-installer-check-cluster-health
- ref: cnv-enable-nested-virtualization-aws
- ref: interop-tests-deploy-odf
- ref: interop-tests-deploy-cnv
- ref: cnv-openshift-virtualization-tests
workflow: ipi-aws
zz_generated_metadata:
branch: master
org: openshift-cnv
repo: cnv-ci
variant: cnv-odf-ocp5.1-konflux
Loading