Skip to content

Commit 9ef3af4

Browse files
committed
Update IPsec CI lane configuration for component readiness
As per changes in openshift/origin#29437 for IPsec E2E tests, each IPsec mode Full and External must be tested with two different CI lanes, so this commit replaces existing e2e-aws-ovn-ipsec-serial CI lane with e2e-aws-ovn-ipsec-full-mode and e2e-aws-ovn-ipsec-external-mode CI lanes. This commit also makes both jobs mandatory and periodic jobs which helps to make IPsec eligible for component readiness. Signed-off-by: Periyasamy Palanisamy <[email protected]>
1 parent beb5fe5 commit 9ef3af4

File tree

26 files changed

+1098
-148
lines changed

26 files changed

+1098
-148
lines changed

ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,19 @@ tests:
114114
env:
115115
EXTRA_MG_ARGS: --host-network
116116
workflow: openshift-e2e-aws-ovn-serial
117-
- always_run: false
118-
as: e2e-aws-ovn-ipsec-serial
119-
optional: true
117+
- as: e2e-aws-ovn-ipsec-full-mode
118+
steps:
119+
cluster_profile: aws
120+
env:
121+
EXTRA_MG_ARGS: --host-network
122+
workflow: openshift-e2e-aws-ovn-ipsec-serial
123+
- as: e2e-aws-ovn-ipsec-external-mode
120124
steps:
121125
cluster_profile: aws
122126
env:
123127
EXTRA_MG_ARGS: --host-network
128+
IPSEC_MODE: External
124129
workflow: openshift-e2e-aws-ovn-ipsec-serial
125-
timeout: 6h0m0s
126130
- as: e2e-metal-ipi-ovn-ipv6
127131
cluster: build05
128132
steps:

ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,19 @@ tests:
115115
env:
116116
EXTRA_MG_ARGS: --host-network
117117
workflow: openshift-e2e-aws-ovn-serial
118-
- always_run: false
119-
as: e2e-aws-ovn-ipsec-serial
120-
optional: true
118+
- as: e2e-aws-ovn-ipsec-full-mode
119+
steps:
120+
cluster_profile: aws
121+
env:
122+
EXTRA_MG_ARGS: --host-network
123+
workflow: openshift-e2e-aws-ovn-ipsec-serial
124+
- as: e2e-aws-ovn-ipsec-external-mode
121125
steps:
122126
cluster_profile: aws
123127
env:
124128
EXTRA_MG_ARGS: --host-network
129+
IPSEC_MODE: External
125130
workflow: openshift-e2e-aws-ovn-ipsec-serial
126-
timeout: 6h0m0s
127131
- as: e2e-metal-ipi-ovn-ipv6
128132
cluster: build05
129133
steps:

ci-operator/config/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.20.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,19 @@ tests:
114114
env:
115115
EXTRA_MG_ARGS: --host-network
116116
workflow: openshift-e2e-aws-ovn-serial
117-
- always_run: false
118-
as: e2e-aws-ovn-ipsec-serial
119-
optional: true
117+
- as: e2e-aws-ovn-ipsec-full-mode
118+
steps:
119+
cluster_profile: aws
120+
env:
121+
EXTRA_MG_ARGS: --host-network
122+
workflow: openshift-e2e-aws-ovn-ipsec-serial
123+
- as: e2e-aws-ovn-ipsec-external-mode
120124
steps:
121125
cluster_profile: aws
122126
env:
123127
EXTRA_MG_ARGS: --host-network
128+
IPSEC_MODE: External
124129
workflow: openshift-e2e-aws-ovn-ipsec-serial
125-
timeout: 6h0m0s
126130
- as: e2e-metal-ipi-ovn-ipv6
127131
cluster: build05
128132
steps:

ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,19 @@ tests:
324324
COMPUTE_NODE_TYPE: c5n.metal
325325
FEATURE_SET: TechPreviewNoUpgrade
326326
workflow: openshift-e2e-aws-ovn-virt
327-
- always_run: false
328-
as: e2e-aws-ovn-ipsec-serial
329-
optional: true
327+
- as: e2e-aws-ovn-ipsec-full-mode
330328
steps:
331329
cluster_profile: aws-2
332330
env:
333331
BASE_DOMAIN: aws-2.ci.openshift.org
334332
workflow: openshift-e2e-aws-ovn-ipsec-serial
335-
timeout: 6h0m0s
333+
- as: e2e-aws-ovn-ipsec-external-mode
334+
steps:
335+
cluster_profile: aws-2
336+
env:
337+
BASE_DOMAIN: aws-2.ci.openshift.org
338+
IPSEC_MODE: External
339+
workflow: openshift-e2e-aws-ovn-ipsec-serial
336340
- as: e2e-aws-csi
337341
optional: true
338342
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.19.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,19 @@ tests:
325325
COMPUTE_NODE_TYPE: c5n.metal
326326
FEATURE_SET: TechPreviewNoUpgrade
327327
workflow: openshift-e2e-aws-ovn-virt
328-
- always_run: false
329-
as: e2e-aws-ovn-ipsec-serial
330-
optional: true
328+
- as: e2e-aws-ovn-ipsec-full-mode
331329
steps:
332330
cluster_profile: aws-2
333331
env:
334332
BASE_DOMAIN: aws-2.ci.openshift.org
335333
workflow: openshift-e2e-aws-ovn-ipsec-serial
336-
timeout: 6h0m0s
334+
- as: e2e-aws-ovn-ipsec-external-mode
335+
steps:
336+
cluster_profile: aws-2
337+
env:
338+
BASE_DOMAIN: aws-2.ci.openshift.org
339+
IPSEC_MODE: External
340+
workflow: openshift-e2e-aws-ovn-ipsec-serial
337341
- as: e2e-aws-csi
338342
optional: true
339343
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.20.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,19 @@ tests:
324324
COMPUTE_NODE_TYPE: c5n.metal
325325
FEATURE_SET: TechPreviewNoUpgrade
326326
workflow: openshift-e2e-aws-ovn-virt
327-
- always_run: false
328-
as: e2e-aws-ovn-ipsec-serial
329-
optional: true
327+
- as: e2e-aws-ovn-ipsec-full-mode
330328
steps:
331329
cluster_profile: aws-2
332330
env:
333331
BASE_DOMAIN: aws-2.ci.openshift.org
334332
workflow: openshift-e2e-aws-ovn-ipsec-serial
335-
timeout: 6h0m0s
333+
- as: e2e-aws-ovn-ipsec-external-mode
334+
steps:
335+
cluster_profile: aws-2
336+
env:
337+
BASE_DOMAIN: aws-2.ci.openshift.org
338+
IPSEC_MODE: External
339+
workflow: openshift-e2e-aws-ovn-ipsec-serial
336340
- as: e2e-aws-csi
337341
optional: true
338342
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,19 @@ tests:
113113
env:
114114
EXTRA_MG_ARGS: --host-network
115115
workflow: openshift-e2e-aws-ovn-serial
116-
- always_run: false
117-
as: e2e-aws-ovn-ipsec-serial
118-
optional: true
116+
- as: e2e-aws-ovn-ipsec-full-mode
117+
steps:
118+
cluster_profile: aws
119+
env:
120+
EXTRA_MG_ARGS: --host-network
121+
workflow: openshift-e2e-aws-ovn-ipsec-serial
122+
- as: e2e-aws-ovn-ipsec-external-mode
119123
steps:
120124
cluster_profile: aws
121125
env:
122126
EXTRA_MG_ARGS: --host-network
127+
IPSEC_MODE: External
123128
workflow: openshift-e2e-aws-ovn-ipsec-serial
124-
timeout: 6h0m0s
125129
- as: e2e-metal-ipi-ovn-ipv6
126130
cluster: build05
127131
steps:

ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.19.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,19 @@ tests:
114114
env:
115115
EXTRA_MG_ARGS: --host-network
116116
workflow: openshift-e2e-aws-ovn-serial
117-
- always_run: false
118-
as: e2e-aws-ovn-ipsec-serial
119-
optional: true
117+
- as: e2e-aws-ovn-ipsec-full-mode
118+
steps:
119+
cluster_profile: aws
120+
env:
121+
EXTRA_MG_ARGS: --host-network
122+
workflow: openshift-e2e-aws-ovn-ipsec-serial
123+
- as: e2e-aws-ovn-ipsec-external-mode
120124
steps:
121125
cluster_profile: aws
122126
env:
123127
EXTRA_MG_ARGS: --host-network
128+
IPSEC_MODE: External
124129
workflow: openshift-e2e-aws-ovn-ipsec-serial
125-
timeout: 6h0m0s
126130
- as: e2e-metal-ipi-ovn-ipv6
127131
cluster: build05
128132
steps:

ci-operator/config/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.20.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,18 @@ tests:
113113
env:
114114
EXTRA_MG_ARGS: --host-network
115115
workflow: openshift-e2e-aws-ovn-serial
116-
- always_run: false
117-
as: e2e-aws-ovn-ipsec-serial
118-
optional: true
116+
- as: e2e-aws-ovn-ipsec-full-mode
117+
steps:
118+
cluster_profile: aws
119+
env:
120+
EXTRA_MG_ARGS: --host-network
121+
workflow: openshift-e2e-aws-ovn-ipsec-serial
122+
- as: e2e-aws-ovn-ipsec-external-mode
119123
steps:
120124
cluster_profile: aws
121125
env:
122126
EXTRA_MG_ARGS: --host-network
127+
IPSEC_MODE: External
123128
workflow: openshift-e2e-aws-ovn-ipsec-serial
124129
timeout: 6h0m0s
125130
- as: e2e-metal-ipi-ovn-ipv6

ci-operator/config/openshift/origin/openshift-origin-main.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,19 @@ tests:
323323
COMPUTE_NODE_TYPE: c5n.metal
324324
FEATURE_SET: TechPreviewNoUpgrade
325325
workflow: openshift-e2e-aws-ovn-virt
326-
- always_run: false
327-
as: e2e-aws-ovn-ipsec-serial
328-
optional: true
326+
- as: e2e-aws-ovn-ipsec-full-mode
329327
steps:
330328
cluster_profile: aws-2
331329
env:
332330
BASE_DOMAIN: aws-2.ci.openshift.org
333331
workflow: openshift-e2e-aws-ovn-ipsec-serial
334-
timeout: 6h0m0s
332+
- as: e2e-aws-ovn-ipsec-external-mode
333+
steps:
334+
cluster_profile: aws-2
335+
env:
336+
BASE_DOMAIN: aws-2.ci.openshift.org
337+
IPSEC_MODE: External
338+
workflow: openshift-e2e-aws-ovn-ipsec-serial
335339
- as: e2e-aws-csi
336340
optional: true
337341
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,19 @@ tests:
324324
COMPUTE_NODE_TYPE: c5n.metal
325325
FEATURE_SET: TechPreviewNoUpgrade
326326
workflow: openshift-e2e-aws-ovn-virt
327-
- always_run: false
328-
as: e2e-aws-ovn-ipsec-serial
329-
optional: true
327+
- as: e2e-aws-ovn-ipsec-full-mode
330328
steps:
331329
cluster_profile: aws-2
332330
env:
333331
BASE_DOMAIN: aws-2.ci.openshift.org
334332
workflow: openshift-e2e-aws-ovn-ipsec-serial
335-
timeout: 6h0m0s
333+
- as: e2e-aws-ovn-ipsec-external-mode
334+
steps:
335+
cluster_profile: aws-2
336+
env:
337+
BASE_DOMAIN: aws-2.ci.openshift.org
338+
IPSEC_MODE: External
339+
workflow: openshift-e2e-aws-ovn-ipsec-serial
336340
- as: e2e-aws-csi
337341
optional: true
338342
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,19 @@ tests:
323323
COMPUTE_NODE_TYPE: c5n.metal
324324
FEATURE_SET: TechPreviewNoUpgrade
325325
workflow: openshift-e2e-aws-ovn-virt
326-
- always_run: false
327-
as: e2e-aws-ovn-ipsec-serial
328-
optional: true
326+
- as: e2e-aws-ovn-ipsec-full-mode
329327
steps:
330328
cluster_profile: aws-2
331329
env:
332330
BASE_DOMAIN: aws-2.ci.openshift.org
333331
workflow: openshift-e2e-aws-ovn-ipsec-serial
334-
timeout: 6h0m0s
332+
- as: e2e-aws-ovn-ipsec-external-mode
333+
steps:
334+
cluster_profile: aws-2
335+
env:
336+
BASE_DOMAIN: aws-2.ci.openshift.org
337+
IPSEC_MODE: External
338+
workflow: openshift-e2e-aws-ovn-ipsec-serial
335339
- as: e2e-aws-csi
336340
optional: true
337341
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

0 commit comments

Comments
 (0)