Skip to content

Commit 2aebbf3

Browse files
gcs278claude
andcommitted
NE-2215: add CI step and presubmits for testing HAProxy 2.8
Add CI jobs for testing the non-default HAProxy version (2.8) with the IngressControllerMultipleHAProxyVersions TechPreview feature gate: - ingress-conf-haproxy-version step: writes an IngressController manifest to SHARED_DIR with the specified haproxyVersion, run before ipi-install cluster-ingress-operator presubmits: - e2e-aws-ovn-haproxy28-techpreview: optional conformance presubmit - e2e-aws-operator-haproxy28-techpreview: optional CIO e2e presubmit - e2e-aws-ovn-upgrade-haproxy28-techpreview: optional upgrade presubmit - e2e-aws-ovn-serial-haproxy28-techpreview: optional serial presubmit (2 shards) router presubmits: - e2e-agnostic-haproxy28-techpreview: optional conformance presubmit (GCP) - e2e-aws-serial-haproxy28-techpreview: optional serial presubmit (2 shards) - e2e-aws-ovn-upgrade-haproxy28-techpreview: optional upgrade presubmit Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 190f70d commit 2aebbf3

9 files changed

Lines changed: 1049 additions & 11 deletions

File tree

ci-operator/config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,39 @@ tests:
153153
steps:
154154
cluster_profile: openshift-org-aws
155155
workflow: openshift-upgrade-aws
156+
- always_run: false
157+
as: e2e-aws-ovn-upgrade-haproxy28-techpreview
158+
optional: true
159+
steps:
160+
cluster_profile: openshift-org-aws
161+
env:
162+
FEATURE_SET: TechPreviewNoUpgrade
163+
HAPROXY_VERSION: "2.8"
164+
pre:
165+
- chain: ipi-conf-aws
166+
- ref: ingress-conf-haproxy-version
167+
- chain: ipi-install
168+
workflow: openshift-upgrade-aws
156169
- as: e2e-aws-ovn-serial
157170
shard_count: 2
158171
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
159172
steps:
160173
cluster_profile: openshift-org-aws
161174
workflow: openshift-e2e-aws-serial
175+
- always_run: false
176+
as: e2e-aws-ovn-serial-haproxy28-techpreview
177+
optional: true
178+
shard_count: 2
179+
steps:
180+
cluster_profile: openshift-org-aws
181+
env:
182+
FEATURE_SET: TechPreviewNoUpgrade
183+
HAPROXY_VERSION: "2.8"
184+
pre:
185+
- chain: ipi-conf-aws
186+
- ref: ingress-conf-haproxy-version
187+
- chain: ipi-install
188+
workflow: openshift-e2e-aws-serial
162189
- always_run: false
163190
as: e2e-aws-ovn-single-node
164191
optional: true
@@ -279,6 +306,19 @@ tests:
279306
env:
280307
FEATURE_SET: TechPreviewNoUpgrade
281308
workflow: openshift-e2e-aws
309+
- always_run: false
310+
as: e2e-aws-ovn-haproxy28-techpreview
311+
optional: true
312+
steps:
313+
cluster_profile: openshift-org-aws
314+
env:
315+
FEATURE_SET: TechPreviewNoUpgrade
316+
HAPROXY_VERSION: "2.8"
317+
pre:
318+
- chain: ipi-conf-aws
319+
- ref: ingress-conf-haproxy-version
320+
- chain: ipi-install
321+
workflow: openshift-e2e-aws
282322
- always_run: false
283323
as: e2e-ibmcloud-operator
284324
optional: true
@@ -309,6 +349,27 @@ tests:
309349
requests:
310350
cpu: 100m
311351
workflow: ipi-aws
352+
- always_run: false
353+
as: e2e-aws-operator-haproxy28-techpreview
354+
optional: true
355+
steps:
356+
cluster_profile: openshift-org-aws
357+
env:
358+
FEATURE_SET: TechPreviewNoUpgrade
359+
HAPROXY_VERSION: "2.8"
360+
pre:
361+
- chain: ipi-conf-aws
362+
- ref: ingress-conf-haproxy-version
363+
- chain: ipi-install
364+
test:
365+
- as: test
366+
cli: latest
367+
commands: make test-e2e
368+
from: src
369+
resources:
370+
requests:
371+
cpu: 100m
372+
workflow: ipi-aws
312373
- always_run: false
313374
as: e2e-openstack-operator
314375
optional: true

ci-operator/config/openshift/router/openshift-router-master.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,57 @@ tests:
115115
steps:
116116
cluster_profile: openshift-org-aws
117117
workflow: openshift-e2e-aws-serial
118+
- always_run: false
119+
as: e2e-aws-serial-haproxy28-techpreview
120+
optional: true
121+
shard_count: 2
122+
steps:
123+
cluster_profile: openshift-org-aws
124+
env:
125+
FEATURE_SET: TechPreviewNoUpgrade
126+
HAPROXY_VERSION: "2.8"
127+
pre:
128+
- chain: ipi-conf-aws
129+
- ref: ingress-conf-haproxy-version
130+
- chain: ipi-install
131+
workflow: openshift-e2e-aws-serial
132+
- always_run: false
133+
as: e2e-agnostic-haproxy28-techpreview
134+
optional: true
135+
steps:
136+
cluster_profile: openshift-org-gcp
137+
env:
138+
FEATURE_SET: TechPreviewNoUpgrade
139+
HAPROXY_VERSION: "2.8"
140+
post:
141+
- chain: gather-core-dump
142+
- chain: ipi-gcp-post
143+
pre:
144+
- ref: enable-node-coredumps
145+
- chain: ipi-conf-gcp
146+
- ref: ingress-conf-haproxy-version
147+
- chain: ipi-install
148+
workflow: openshift-e2e-gcp
149+
- always_run: false
150+
as: e2e-upgrade-haproxy28-techpreview
151+
optional: true
152+
steps:
153+
cluster_profile: openshift-org-azure
154+
env:
155+
FEATURE_SET: TechPreviewNoUpgrade
156+
HAPROXY_VERSION: "2.8"
157+
post:
158+
- chain: gather-core-dump
159+
- chain: ipi-azure-post
160+
pre:
161+
- ref: enable-node-coredumps
162+
- chain: ipi-conf-azure
163+
- chain: azure-provision-service-principal-minimal-permission
164+
- ref: rhcos-conf-osstream
165+
- ref: ingress-conf-haproxy-version
166+
- chain: ipi-install
167+
- ref: ipi-azure-rbac
168+
workflow: openshift-upgrade-azure
118169
- always_run: false
119170
as: e2e-metal-ipi-ovn-router
120171
capabilities:

0 commit comments

Comments
 (0)