Update IPsec CI lane configuration for IPsec tests

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 as default presubmit for cluster network operator.

Signed-off-by: Periyasamy Palanisamy <[email protected]>

Author: pperiyasamy

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

@@ -114,15 +114,21 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6
   cluster: build05
   steps:

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

@@ -115,15 +115,21 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6
   cluster: build05
   steps:

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

@@ -114,15 +114,21 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6
   cluster: build05
   steps:

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

@@ -332,14 +332,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   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

@@ -333,14 +333,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   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

@@ -332,14 +332,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   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

@@ -113,15 +113,21 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6
   cluster: build05
   steps:

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

@@ -114,15 +114,21 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6
   cluster: build05
   steps:

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

@@ -113,13 +113,20 @@ tests:
     env:
       EXTRA_MG_ARGS: --host-network
     workflow: openshift-e2e-aws-ovn-serial
-- always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-full-mode
+  optional: true
+  steps:
+    cluster_profile: aws
+    env:
+      EXTRA_MG_ARGS: --host-network
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
+- as: e2e-aws-ovn-ipsec-external-mode
   optional: true
   steps:
     cluster_profile: aws
     env:
       EXTRA_MG_ARGS: --host-network
+      IPSEC_MODE: External
     workflow: openshift-e2e-aws-ovn-ipsec-serial
   timeout: 6h0m0s
 - as: e2e-metal-ipi-ovn-ipv6

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

@@ -331,14 +331,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

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

@@ -332,14 +332,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

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

@@ -331,14 +331,22 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ovn-virt
 - always_run: false
-  as: e2e-aws-ovn-ipsec-serial
+  as: e2e-aws-ovn-ipsec-full-mode
   optional: true
   steps:
     cluster_profile: aws-2
     env:
       BASE_DOMAIN: aws-2.ci.openshift.org
     workflow: openshift-e2e-aws-ovn-ipsec-serial
-  timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-ipsec-external-mode
+  optional: true
+  steps:
+    cluster_profile: aws-2
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      IPSEC_MODE: External
+    workflow: openshift-e2e-aws-ovn-ipsec-serial
 - as: e2e-aws-csi
   optional: true
   skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$