Skip to content

[DO NOT MERGE] Rerun 4.17.54 multi arch jobs #79398

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

Open
rh-akhatavk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[DO NOT MERGE] Rerun 4.17.54 multi arch jobs #79398

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
4 changes: 2 additions & 2 deletions ...openshift/multiarch/openshift-multiarch-main__nightly-4.17-upgrade-from-nightly-4.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ tests:
OCP_ARCH: arm64
TEST_TYPE: upgrade-conformance
workflow: openshift-upgrade-azure
- as: ocp-ovn-remote-libvirt-multi-z-z
- as: ocp-ovn-remote-libvirt-multi-z-z-test
capabilities:
- intranet
cron: 0 20 * * 5
Expand All @@ -131,7 +131,7 @@ tests:
TEST_TYPE: upgrade
USE_EXTERNAL_DNS: "true"
workflow: openshift-e2e-libvirt-vpn
- as: ocp-ovn-remote-s2s-libvirt-multi-p-p
- as: ocp-ovn-remote-s2s-libvirt-multi-p-p-test
capabilities:
- power-s2s-dns
cron: 0 20 * * 5
Expand Down
4 changes: 2 additions & 2 deletions ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ tests:
OCP_ARCH: arm64
TEST_TYPE: upgrade-conformance
workflow: openshift-upgrade-azure
- as: ocp-e2e-ovn-remote-libvirt-s390x
- as: ocp-e2e-ovn-remote-libvirt-s390x-test
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot May 18, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Consider standardizing test identifiers consistently across similar tests.

The -test suffix is applied to some weekly tests (lines 362, 458) but not others with similar characteristics. For example, Line 473 (ocp-e2e-ovn-remote-s2s-libvirt-ppc64le) runs on the same weekly Friday schedule as line 362 but doesn't receive the -test suffix. This creates inconsistent naming conventions within the same configuration file.

If the goal is to standardize test identifiers with a -test suffix, consider applying it consistently across all similar test entries, or document the criteria for when the suffix should be applied.

Also applies to: 458-458, 473-473, 489-489

🤖 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/multiarch/openshift-multiarch-main__nightly-4.17.yaml`
at line 362, The job names are inconsistent: add or remove the "-test" suffix
consistently across similar weekly tests (e.g., change
"ocp-e2e-ovn-remote-libvirt-s390x-test" and
"ocp-e2e-ovn-remote-s2s-libvirt-ppc64le" and the entries referenced at lines
with "ocp-e2e-ovn-remote-..." to follow a single convention), so update the
identifiers in the YAML so all weekly Friday scheduled OVN remote libvirt jobs
either all include "-test" (preferred) or none do, and update any references to
those job names elsewhere in the file/config to match; alternatively, if the
suffix is conditional, add a short comment in the file documenting the exact
criteria for appending "-test" to job identifiers.

⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Search for references to the old test identifier across the codebase

echo "=== Searching for references to old test name ==="
rg -n --type=yaml --type=md --type=sh --type=py 'ocp-e2e-ovn-remote-libvirt-s390x' -g '!openshift-multiarch-main__nightly-4.17.yaml'

echo -e "\n=== Checking CI job configuration references ==="
fd -e yaml -e json . ci-operator/jobs/ --exec rg -l 'ocp-e2e-ovn-remote-libvirt-s390x'

echo -e "\n=== Checking for generated job configs ==="
fd . ci-operator/jobs/openshift/multiarch --exec cat {} | grep -n 'ocp-e2e-ovn-remote-libvirt-s390x' || echo "No matches in generated jobs"

Repository: openshift/release

Length of output: 147

🏁 Script executed:

# Check if ci-operator/jobs is generated (typically ignored)
git ls-files -o -i -k --exclude-standard | head -20

# Get info on ci-operator/jobs directory
ls -la ci-operator/jobs/openshift/multiarch/ 2>/dev/null | head -10

# Check for .gitignore patterns that might indicate generated files
cat .gitignore | grep -i "ci-operator/jobs" || echo "No gitignore rules found for jobs dir"

Repository: openshift/release

Length of output: 474

🏁 Script executed:

# More targeted search: check config files for references to old identifier
# Limit to openshift/multiarch configs only
rg 'ocp-e2e-ovn-remote-libvirt-s390x' ci-operator/config/openshift/multiarch/ --type=yaml -n | head -20

# Check if there are template references in step registry or workflows
rg 'ocp-e2e-ovn-remote-libvirt-s390x' ci-operator/step-registry/ --type=yaml -n 2>/dev/null | head -20

Repository: openshift/release

Length of output: 1983

🏁 Script executed:

# Check the actual file to understand the change context
sed -n '360,365p' ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.17.yaml

# Also check around line 458 mentioned in scratchpad
sed -n '456,461p' ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.17.yaml

Repository: openshift/release

Length of output: 396

Verify that renaming this test identifier won't break external references.

The test identifier in 4.17 (ocp-e2e-ovn-remote-libvirt-s390x-test) differs from all other multiarch release branches, which use ocp-e2e-ovn-remote-libvirt-s390x (without the -test suffix). If external systems (CI dashboards, monitoring, job triggers) reference this identifier, the rename could cause failures. Verify no downstream dependencies exist before committing this change.

🤖 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/multiarch/openshift-multiarch-main__nightly-4.17.yaml`
at line 362, The test identifier was changed to
"ocp-e2e-ovn-remote-libvirt-s390x-test" which deviates from other branches that
use "ocp-e2e-ovn-remote-libvirt-s390x"; search for both strings across all repos
and CI systems (grep in this repo, other release branch configs, Prow job
definitions, job triggers, dashboards, monitoring rules, and external CI
consumers) to find any downstream references, update those references to the new
identifier if safe, or rename this entry back to
"ocp-e2e-ovn-remote-libvirt-s390x" to match the canonical name, and document the
change in the PR description so integrators are aware.

capabilities:
- intranet
cron: 0 18 * * 5
Expand Down Expand Up @@ -455,7 +455,7 @@ tests:
TEST_TYPE: conformance-serial
USE_EXTERNAL_DNS: "true"
workflow: openshift-e2e-libvirt-vpn
- as: ocp-fips-ovn-remote-libvirt-multi-z-z
- as: ocp-fips-ovn-remote-libvirt-multi-z-z-test
capabilities:
- intranet
cron: 0 22 * * 5
Expand Down
16 changes: 8 additions & 8 deletions ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23093,7 +23093,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.17"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-multiarch-main-nightly-4.17-ocp-e2e-ovn-remote-libvirt-s390x
name: periodic-ci-openshift-multiarch-main-nightly-4.17-ocp-e2e-ovn-remote-libvirt-s390x-test
spec:
containers:
- args:
Expand All @@ -23102,7 +23102,7 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=ocp-e2e-ovn-remote-libvirt-s390x
- --target=ocp-e2e-ovn-remote-libvirt-s390x-test
- --variant=nightly-4.17
command:
- ci-operator
Expand Down Expand Up @@ -24260,7 +24260,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.17"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-multiarch-main-nightly-4.17-ocp-fips-ovn-remote-libvirt-multi-z-z
name: periodic-ci-openshift-multiarch-main-nightly-4.17-ocp-fips-ovn-remote-libvirt-multi-z-z-test
spec:
containers:
- args:
Expand All @@ -24269,7 +24269,7 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=ocp-fips-ovn-remote-libvirt-multi-z-z
- --target=ocp-fips-ovn-remote-libvirt-multi-z-z-test
- --variant=nightly-4.17
command:
- ci-operator
Expand Down Expand Up @@ -25261,7 +25261,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.17"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-multiarch-main-nightly-4.17-upgrade-from-nightly-4.16-ocp-ovn-remote-libvirt-multi-z-z
name: periodic-ci-openshift-multiarch-main-nightly-4.17-upgrade-from-nightly-4.16-ocp-ovn-remote-libvirt-multi-z-z-test
spec:
containers:
- args:
Expand All @@ -25270,7 +25270,7 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=ocp-ovn-remote-libvirt-multi-z-z
- --target=ocp-ovn-remote-libvirt-multi-z-z-test
- --variant=nightly-4.17-upgrade-from-nightly-4.16
command:
- ci-operator
Expand Down Expand Up @@ -25345,7 +25345,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.17"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-multiarch-main-nightly-4.17-upgrade-from-nightly-4.16-ocp-ovn-remote-s2s-libvirt-multi-p-p
name: periodic-ci-openshift-multiarch-main-nightly-4.17-upgrade-from-nightly-4.16-ocp-ovn-remote-s2s-libvirt-multi-p-p-test
spec:
containers:
- args:
Expand All @@ -25354,7 +25354,7 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=ocp-ovn-remote-s2s-libvirt-multi-p-p
- --target=ocp-ovn-remote-s2s-libvirt-multi-p-p-test
- --variant=nightly-4.17-upgrade-from-nightly-4.16
command:
- ci-operator
Expand Down