Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,11 @@ tests:
cluster_profile: openshift-org-aws
workflow: openshift-upgrade-aws
- always_run: false
as: e2e-aws-ovn-upgrade-haproxy28-techpreview
as: e2e-aws-ovn-upgrade-haproxy28
Comment thread
coderabbitai[bot] marked this conversation as resolved.
optional: true
steps:
cluster_profile: openshift-org-aws
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
Expand All @@ -182,13 +181,12 @@ tests:
cluster_profile: openshift-org-aws
workflow: openshift-e2e-aws-serial
- always_run: false
as: e2e-aws-ovn-serial-haproxy28-techpreview
as: e2e-aws-ovn-serial-haproxy28
optional: true
shard_count: 2
steps:
cluster_profile: openshift-org-aws
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
Expand Down Expand Up @@ -316,12 +314,11 @@ tests:
FEATURE_SET: TechPreviewNoUpgrade
workflow: openshift-e2e-aws
- always_run: false
as: e2e-aws-ovn-haproxy28-techpreview
as: e2e-aws-ovn-haproxy28
optional: true
steps:
cluster_profile: openshift-org-aws
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
Expand Down Expand Up @@ -359,12 +356,25 @@ tests:
cpu: 100m
workflow: ipi-aws
- always_run: false
as: e2e-aws-operator-haproxy28-techpreview
as: e2e-aws-ovn-fips-haproxy28
optional: true
steps:
cluster_profile: openshift-org-aws
env:
FIPS_ENABLED: "true"
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
- ref: fips-check
- chain: ipi-install
- ref: ingress-conf-haproxy-version
workflow: openshift-e2e-aws
- always_run: false
as: e2e-aws-operator-haproxy28
optional: true
steps:
cluster_profile: openshift-org-aws
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
Expand Down
46 changes: 40 additions & 6 deletions ci-operator/config/openshift/router/openshift-router-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,24 @@ tests:
cluster_profile: openshift-org-aws
workflow: openshift-e2e-aws-serial
- always_run: false
as: e2e-aws-serial-haproxy28-techpreview
as: e2e-aws-serial-haproxy28
optional: true
shard_count: 2
steps:
cluster_profile: openshift-org-aws
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
- chain: ipi-install
- ref: ingress-conf-haproxy-version
workflow: openshift-e2e-aws-serial
- always_run: false
as: e2e-agnostic-haproxy28-techpreview
as: e2e-agnostic-haproxy28
optional: true
steps:
cluster_profile: openshift-org-gcp
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
post:
- chain: gather-core-dump
Expand All @@ -147,12 +145,11 @@ tests:
- ref: ingress-conf-haproxy-version
workflow: openshift-e2e-gcp
- always_run: false
as: e2e-upgrade-haproxy28-techpreview
as: e2e-upgrade-haproxy28
optional: true
steps:
cluster_profile: openshift-org-azure
env:
FEATURE_SET: TechPreviewNoUpgrade
HAPROXY_VERSION: "2.8"
post:
- chain: gather-core-dump
Expand All @@ -166,6 +163,43 @@ tests:
- ref: ipi-azure-rbac
- ref: ingress-conf-haproxy-version
workflow: openshift-upgrade-azure
- always_run: false
as: e2e-aws-fips-haproxy28
optional: true
steps:
cluster_profile: openshift-org-aws
env:
FIPS_ENABLED: "true"
HAPROXY_VERSION: "2.8"
pre:
- chain: ipi-conf-aws
- ref: fips-check
- chain: ipi-install
- ref: ingress-conf-haproxy-version
Comment on lines +174 to +178

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.

🎯 Functional Correctness | 🟠 Major | ⚑ Quick win

Move fips-check after ipi-install.

fips-check runs oc get nodes and oc debug node/... for every cluster node. The registered AWS pre chain places ipi-conf-aws before ipi-install. At Line [176], this job runs fips-check before installation, so the node check cannot pass. (github.com)

Proposed ordering
     - chain: ipi-conf-aws
-    - ref: fips-check
     - chain: ipi-install
+    - ref: fips-check
     - ref: ingress-conf-haproxy-version
πŸ“ 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
pre:
- chain: ipi-conf-aws
- ref: fips-check
- chain: ipi-install
- ref: ingress-conf-haproxy-version
pre:
- chain: ipi-conf-aws
- chain: ipi-install
- ref: fips-check
- ref: ingress-conf-haproxy-version
πŸ€– 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/router/openshift-router-master.yaml` around
lines 174 - 178, Reorder the pre steps so the fips-check ref runs after the
ipi-install chain; keep ipi-conf-aws first and ingress-conf-haproxy-version in
its existing relative position unless required by the ordering change.

Source: MCP tools

workflow: openshift-e2e-aws
- always_run: false
as: perfscale-aws-ingress-perf-haproxy28
optional: true
steps:
cluster_profile: aws-perfscale
env:
BASE_DOMAIN: perfscale.devcluster.openshift.com
COMPUTE_NODE_REPLICAS: "9"
COMPUTE_NODE_TYPE: m5.2xlarge
HAPROXY_VERSION: "2.8"
LOKI_USE_SERVICEMONITOR: "false"
OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: c5.4xlarge
SET_ENV_BY_PLATFORM: custom
post:
- chain: gather-core-dump
- chain: ipi-aws-post
pre:
- ref: enable-node-coredumps
- chain: ipi-aws-pre
- chain: create-infra-move-ingress-monitoring-registry
- ref: ingress-conf-haproxy-version
test:
- chain: openshift-qe-ingress-perf
- always_run: false
as: e2e-metal-ipi-ovn-router
capabilities:
Expand Down
Loading