Skip to content

INTEROP-9255: Register ACM+Virt interop jobs in Sippy #3830

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

Draft
sg-rh wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −1
Draft

INTEROP-9255: Register ACM+Virt interop jobs in Sippy #3830

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
45 changes: 45 additions & 0 deletions config/views.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,6 +1642,51 @@ component_readiness:
enabled: false
regression_tracking:
enabled: false
- name: 4.22-LP-Interop--lpMainline
base_release:
release: "4.21"
relative_start: ga-30d
relative_end: ga
sample_release:
release: "4.22"
relative_start: now-30d
relative_end: now
variant_options:
column_group_by:
Architecture: { }
Network: { }
Platform: { }
Topology: { }
db_group_by:
Architecture: { }
FeatureSet: { }
Installer: { }
Network: { }
Platform: { }
Suite: { }
Topology: { }
Upgrade: { }
include_variants:
LayeredProduct: []
Network:
- ovn
Owner:
- mpiit
advanced_options:
minimum_failure: 2
confidence: 95
pity_factor: 5
ignore_missing: false
ignore_disruption: true
flake_as_failure: false
pass_rate_required_new_tests: 95
include_multi_release_analysis: true
metrics:
enabled: false
regression_tracking:
enabled: true
prime_cache:
enabled: false
- name: 4.22-LP-OCP-Compat--lpMainline
base_release:
release: "4.21"
Expand Down
2 changes: 2 additions & 0 deletions pkg/variantregistry/ocp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,8 @@ func setLayeredProduct(_ logrus.FieldLogger, variants map[string]string, jobName
{"-lpga-lp-ocp-compat-cr--servicemesh-", "lp-ocp-compat--servicemesh--lpGA"},
{"-lpga-lp-ocp-compat-cr--operator-e2e-", "lp-ocp-compat--serverless--lpGA"},
{"-coo-", "lp-interop-coo"},
{"-acm-cnv-", "lp-interop--acm-virt"},
{"-acm-virt-", "lp-interop--acm-virt"},
Comment on lines +1366 to +1367

@coderabbitai coderabbitai Bot Jul 25, 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.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== locate files =="
git ls-files | rg '(^|/)(ocp\.go|ocp_test\.go)$|pkg/variantregistry' || true

echo "== relevant mapping lines =="
if [ -f pkg/variantregistry/ocp.go ]; then
  nl -ba pkg/variantregistry/ocp.go | sed -n '1330,1385p'
fi

echo "== search for relevant test cases =="
if [ -f pkg/variantregistry/ocp_test.go ]; then
  rg -n "lp-interop|acm-cnv|acm-virt|acm|cnv|virt" pkg/variantregistry/ocp_test.go || true
  echo "== file size =="
  wc -l pkg/variantregistry/ocp_test.go
  echo "== outline/test function names (top-level relevant) =="
  rg -n "func Test|func .*Layer|func .*Variant|acm|lp-interop|cnv|virt" pkg/variantregistry/ocp_test.go || true
else
  echo "pkg/variantregistry/ocp_test.go not found"
fi

echo "== define mapping-related function outline =="
if [ -f pkg/variantregistry/ocp.go ]; then
  ast-grep outline pkg/variantregistry/ocp.go --match "map" --view expanded || true
  ast-grep outline pkg/variantregistry/ocp.go --match "func" --view expanded || true
fi

Repository: openshift/sippy

Length of output: 502

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== relevant mapping lines =="
awk 'NR>=1330 && NR<=1385 {printf "%6d\t%s\n", NR, $0}' pkg/variantregistry/ocp.go

echo "== search for relevant test cases =="
awk 'BEGIN{IGNORECASE=1} /lp-interop|acm-cnv|acm-virt|acm|cnv|virt/' pkg/variantregistry/ocp_test.go || true

echo "== test function/function name lines and relevant counts =="
awk '/func Test|func .*Layer|func .*Variant|acm|lp-interop|cnv|virt/ {printf "%6d\t%s\n", NR, $0}' pkg/variantregistry/ocp_test.go || true

echo "== file sizes =="
wc -l pkg/variantregistry/ocp_test.go pkg/variantregistry/ocp.go

echo "== structural/context for mapping slice =="
awk '/acm-cnv-|acm-virt-|-virt-|-cnv-|layer|Layer|Job|Variant|variant/ {printf "%6d\t%s\n", NR, $0}' pkg/variantregistry/ocp.go | sed -n '1,240p'

Repository: openshift/sippy

Length of output: 21248

Add regression coverage for the new ACM layered-product mappings.

Add focused test cases for -acm-cnv- and -acm-virt- in pkg/variantregistry/ocp_test.go, including a case that proves precedence over the generic -virt/-cnv mappings. This is needed to meet the Go test-coverage requirement for modified variant classification behavior.

🤖 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 `@pkg/variantregistry/ocp.go` around lines 1366 - 1367, Add focused regression
tests in the OCP variant registry tests for the new -acm-cnv- and -acm-virt-
mappings, verifying each resolves to lp-interop--acm-virt and takes precedence
over the generic -virt and -cnv mappings. Keep the cases scoped to the modified
variant-classification behavior.

Source: Coding guidelines

{"-virt", "virt"},
{"-cnv", "virt"},
{"-kubevirt", "virt"},
Expand Down
2 changes: 1 addition & 1 deletion pkg/variantregistry/snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,7 @@ periodic-ci-RedHatQE-interop-testing-master-acm-virt-ocp4.22-p2p-cclm-liv-mig-lp
FeatureSet: default
Installer: ipi
JobTier: candidate
LayeredProduct: virt
LayeredProduct: lp-interop--acm-virt
Network: ovn
NetworkAccess: default
NetworkStack: ipv4
Expand Down