Skip to content

Commit 2206f8c

Browse files
pperiyasamypperiyasamy
committed
Add IPsec job for NAT-T encapsulation
Signed-off-by: Periyasamy Palanisamy <[email protected]>
1 parent 7232560 commit 2206f8c

File tree

26 files changed

+1059
-6
lines changed

26 files changed

+1059
-6
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ tests:
132132
EXTRA_MG_ARGS: --host-network
133133
IPSEC_MODE: External
134134
workflow: openshift-e2e-aws-ovn-ipsec-serial
135+
- as: e2e-aws-ovn-ipsec-full-natt-mode
136+
optional: true
137+
steps:
138+
cluster_profile: aws
139+
env:
140+
EXTRA_MG_ARGS: --host-network
141+
IPSEC_ENCAPSULATION: Always
142+
IPSEC_MODE: Full
143+
workflow: openshift-e2e-aws-ovn-ipsec-serial
135144
- as: e2e-metal-ipi-ovn-ipv6
136145
cluster: build05
137146
steps:

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ tests:
133133
EXTRA_MG_ARGS: --host-network
134134
IPSEC_MODE: External
135135
workflow: openshift-e2e-aws-ovn-ipsec-serial
136+
- as: e2e-aws-ovn-ipsec-full-natt-mode
137+
optional: true
138+
steps:
139+
cluster_profile: aws
140+
env:
141+
EXTRA_MG_ARGS: --host-network
142+
IPSEC_ENCAPSULATION: Always
143+
IPSEC_MODE: Full
144+
workflow: openshift-e2e-aws-ovn-ipsec-serial
136145
- as: e2e-metal-ipi-ovn-ipv6
137146
cluster: build05
138147
steps:

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ tests:
132132
EXTRA_MG_ARGS: --host-network
133133
IPSEC_MODE: External
134134
workflow: openshift-e2e-aws-ovn-ipsec-serial
135+
- as: e2e-aws-ovn-ipsec-full-natt-mode
136+
optional: true
137+
steps:
138+
cluster_profile: aws
139+
env:
140+
EXTRA_MG_ARGS: --host-network
141+
IPSEC_ENCAPSULATION: Always
142+
IPSEC_MODE: Full
143+
workflow: openshift-e2e-aws-ovn-ipsec-serial
135144
- as: e2e-metal-ipi-ovn-ipv6
136145
cluster: build05
137146
steps:

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,16 @@ tests:
341341
BASE_DOMAIN: aws-2.ci.openshift.org
342342
IPSEC_MODE: External
343343
workflow: openshift-e2e-aws-ovn-ipsec-serial
344+
- always_run: false
345+
as: e2e-aws-ovn-ipsec-full-natt-mode
346+
optional: true
347+
steps:
348+
cluster_profile: aws-2
349+
env:
350+
BASE_DOMAIN: aws-2.ci.openshift.org
351+
IPSEC_ENCAPSULATION: Always
352+
IPSEC_MODE: Full
353+
workflow: openshift-e2e-aws-ovn-ipsec-serial
344354
- as: e2e-aws-csi
345355
optional: true
346356
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,16 @@ tests:
342342
BASE_DOMAIN: aws-2.ci.openshift.org
343343
IPSEC_MODE: External
344344
workflow: openshift-e2e-aws-ovn-ipsec-serial
345+
- always_run: false
346+
as: e2e-aws-ovn-ipsec-full-natt-mode
347+
optional: true
348+
steps:
349+
cluster_profile: aws-2
350+
env:
351+
BASE_DOMAIN: aws-2.ci.openshift.org
352+
IPSEC_ENCAPSULATION: Always
353+
IPSEC_MODE: Full
354+
workflow: openshift-e2e-aws-ovn-ipsec-serial
345355
- as: e2e-aws-csi
346356
optional: true
347357
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,16 @@ tests:
341341
BASE_DOMAIN: aws-2.ci.openshift.org
342342
IPSEC_MODE: External
343343
workflow: openshift-e2e-aws-ovn-ipsec-serial
344+
- always_run: false
345+
as: e2e-aws-ovn-ipsec-full-natt-mode
346+
optional: true
347+
steps:
348+
cluster_profile: aws-2
349+
env:
350+
BASE_DOMAIN: aws-2.ci.openshift.org
351+
IPSEC_ENCAPSULATION: Always
352+
IPSEC_MODE: Full
353+
workflow: openshift-e2e-aws-ovn-ipsec-serial
344354
- as: e2e-aws-csi
345355
optional: true
346356
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,15 @@ tests:
131131
EXTRA_MG_ARGS: --host-network
132132
IPSEC_MODE: External
133133
workflow: openshift-e2e-aws-ovn-ipsec-serial
134+
- as: e2e-aws-ovn-ipsec-full-natt-mode
135+
optional: true
136+
steps:
137+
cluster_profile: aws
138+
env:
139+
EXTRA_MG_ARGS: --host-network
140+
IPSEC_ENCAPSULATION: Always
141+
IPSEC_MODE: Full
142+
workflow: openshift-e2e-aws-ovn-ipsec-serial
134143
- as: e2e-metal-ipi-ovn-ipv6
135144
cluster: build05
136145
steps:

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,15 @@ tests:
132132
EXTRA_MG_ARGS: --host-network
133133
IPSEC_MODE: External
134134
workflow: openshift-e2e-aws-ovn-ipsec-serial
135+
- as: e2e-aws-ovn-ipsec-full-natt-mode
136+
optional: true
137+
steps:
138+
cluster_profile: aws
139+
env:
140+
EXTRA_MG_ARGS: --host-network
141+
IPSEC_ENCAPSULATION: Always
142+
IPSEC_MODE: Full
143+
workflow: openshift-e2e-aws-ovn-ipsec-serial
135144
- as: e2e-metal-ipi-ovn-ipv6
136145
cluster: build05
137146
steps:

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,15 @@ tests:
131131
EXTRA_MG_ARGS: --host-network
132132
IPSEC_MODE: External
133133
workflow: openshift-e2e-aws-ovn-ipsec-serial
134-
timeout: 6h0m0s
134+
- as: e2e-aws-ovn-ipsec-full-natt-mode
135+
optional: true
136+
steps:
137+
cluster_profile: aws
138+
env:
139+
EXTRA_MG_ARGS: --host-network
140+
IPSEC_ENCAPSULATION: Always
141+
IPSEC_MODE: Full
142+
workflow: openshift-e2e-aws-ovn-ipsec-serial
135143
- as: e2e-metal-ipi-ovn-ipv6
136144
cluster: build05
137145
steps:

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,16 @@ tests:
340340
BASE_DOMAIN: aws-2.ci.openshift.org
341341
IPSEC_MODE: External
342342
workflow: openshift-e2e-aws-ovn-ipsec-serial
343+
- always_run: false
344+
as: e2e-aws-ovn-ipsec-full-natt-mode
345+
optional: true
346+
steps:
347+
cluster_profile: aws-2
348+
env:
349+
BASE_DOMAIN: aws-2.ci.openshift.org
350+
IPSEC_ENCAPSULATION: Always
351+
IPSEC_MODE: Full
352+
workflow: openshift-e2e-aws-ovn-ipsec-serial
343353
- as: e2e-aws-csi
344354
optional: true
345355
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,16 @@ tests:
341341
BASE_DOMAIN: aws-2.ci.openshift.org
342342
IPSEC_MODE: External
343343
workflow: openshift-e2e-aws-ovn-ipsec-serial
344+
- always_run: false
345+
as: e2e-aws-ovn-ipsec-full-natt-mode
346+
optional: true
347+
steps:
348+
cluster_profile: aws-2
349+
env:
350+
BASE_DOMAIN: aws-2.ci.openshift.org
351+
IPSEC_ENCAPSULATION: Always
352+
IPSEC_MODE: Full
353+
workflow: openshift-e2e-aws-ovn-ipsec-serial
344354
- as: e2e-aws-csi
345355
optional: true
346356
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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,16 @@ tests:
340340
BASE_DOMAIN: aws-2.ci.openshift.org
341341
IPSEC_MODE: External
342342
workflow: openshift-e2e-aws-ovn-ipsec-serial
343+
- always_run: false
344+
as: e2e-aws-ovn-ipsec-full-natt-mode
345+
optional: true
346+
steps:
347+
cluster_profile: aws-2
348+
env:
349+
BASE_DOMAIN: aws-2.ci.openshift.org
350+
IPSEC_ENCAPSULATION: Always
351+
IPSEC_MODE: Full
352+
workflow: openshift-e2e-aws-ovn-ipsec-serial
343353
- as: e2e-aws-csi
344354
optional: true
345355
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$

‎ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,89 @@ presubmits:
331331
secret:
332332
secretName: result-aggregator
333333
trigger: (?m)^/test( | .* )e2e-aws-ovn-ipsec-full-mode,?($|\s.*)
334+
- agent: kubernetes
335+
always_run: true
336+
branches:
337+
- ^master$
338+
- ^master-
339+
cluster: build11
340+
context: ci/prow/e2e-aws-ovn-ipsec-full-natt-mode
341+
decorate: true
342+
decoration_config:
343+
oauth_token_secret:
344+
key: oauth
345+
name: github-credentials-openshift-ci-robot-private-git-cloner
346+
hidden: true
347+
labels:
348+
ci-operator.openshift.io/cloud: aws
349+
ci-operator.openshift.io/cloud-cluster-profile: aws
350+
ci.openshift.io/generator: prowgen
351+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
352+
name: pull-ci-openshift-priv-cluster-network-operator-master-e2e-aws-ovn-ipsec-full-natt-mode
353+
optional: true
354+
path_alias: github.com/openshift/cluster-network-operator
355+
rerun_command: /test e2e-aws-ovn-ipsec-full-natt-mode
356+
spec:
357+
containers:
358+
- args:
359+
- --gcs-upload-secret=/secrets/gcs/service-account.json
360+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
361+
- --lease-server-credentials-file=/etc/boskos/credentials
362+
- --oauth-token-path=/usr/local/github-credentials/oauth
363+
- --report-credentials-file=/etc/report/credentials
364+
- --secret-dir=/secrets/ci-pull-credentials
365+
- --target=e2e-aws-ovn-ipsec-full-natt-mode
366+
command:
367+
- ci-operator
368+
image: ci-operator:latest
369+
imagePullPolicy: Always
370+
name: ""
371+
resources:
372+
requests:
373+
cpu: 10m
374+
volumeMounts:
375+
- mountPath: /etc/boskos
376+
name: boskos
377+
readOnly: true
378+
- mountPath: /secrets/ci-pull-credentials
379+
name: ci-pull-credentials
380+
readOnly: true
381+
- mountPath: /secrets/gcs
382+
name: gcs-credentials
383+
readOnly: true
384+
- mountPath: /usr/local/github-credentials
385+
name: github-credentials-openshift-ci-robot-private-git-cloner
386+
readOnly: true
387+
- mountPath: /secrets/manifest-tool
388+
name: manifest-tool-local-pusher
389+
readOnly: true
390+
- mountPath: /etc/pull-secret
391+
name: pull-secret
392+
readOnly: true
393+
- mountPath: /etc/report
394+
name: result-aggregator
395+
readOnly: true
396+
serviceAccountName: ci-operator
397+
volumes:
398+
- name: boskos
399+
secret:
400+
items:
401+
- key: credentials
402+
path: credentials
403+
secretName: boskos-credentials
404+
- name: ci-pull-credentials
405+
secret:
406+
secretName: ci-pull-credentials
407+
- name: manifest-tool-local-pusher
408+
secret:
409+
secretName: manifest-tool-local-pusher
410+
- name: pull-secret
411+
secret:
412+
secretName: registry-pull-credentials
413+
- name: result-aggregator
414+
secret:
415+
secretName: result-aggregator
416+
trigger: (?m)^/test( | .* )e2e-aws-ovn-ipsec-full-natt-mode,?($|\s.*)
334417
- agent: kubernetes
335418
always_run: true
336419
branches:

‎ci-operator/jobs/openshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.19-presubmits.yaml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,89 @@ presubmits:
331331
secret:
332332
secretName: result-aggregator
333333
trigger: (?m)^/test( | .* )e2e-aws-ovn-ipsec-full-mode,?($|\s.*)
334+
- agent: kubernetes
335+
always_run: true
336+
branches:
337+
- ^release-4\.19$
338+
- ^release-4\.19-
339+
cluster: build09
340+
context: ci/prow/e2e-aws-ovn-ipsec-full-natt-mode
341+
decorate: true
342+
decoration_config:
343+
oauth_token_secret:
344+
key: oauth
345+
name: github-credentials-openshift-ci-robot-private-git-cloner
346+
hidden: true
347+
labels:
348+
ci-operator.openshift.io/cloud: aws
349+
ci-operator.openshift.io/cloud-cluster-profile: aws
350+
ci.openshift.io/generator: prowgen
351+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
352+
name: pull-ci-openshift-priv-cluster-network-operator-release-4.19-e2e-aws-ovn-ipsec-full-natt-mode
353+
optional: true
354+
path_alias: github.com/openshift/cluster-network-operator
355+
rerun_command: /test e2e-aws-ovn-ipsec-full-natt-mode
356+
spec:
357+
containers:
358+
- args:
359+
- --gcs-upload-secret=/secrets/gcs/service-account.json
360+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
361+
- --lease-server-credentials-file=/etc/boskos/credentials
362+
- --oauth-token-path=/usr/local/github-credentials/oauth
363+
- --report-credentials-file=/etc/report/credentials
364+
- --secret-dir=/secrets/ci-pull-credentials
365+
- --target=e2e-aws-ovn-ipsec-full-natt-mode
366+
command:
367+
- ci-operator
368+
image: ci-operator:latest
369+
imagePullPolicy: Always
370+
name: ""
371+
resources:
372+
requests:
373+
cpu: 10m
374+
volumeMounts:
375+
- mountPath: /etc/boskos
376+
name: boskos
377+
readOnly: true
378+
- mountPath: /secrets/ci-pull-credentials
379+
name: ci-pull-credentials
380+
readOnly: true
381+
- mountPath: /secrets/gcs
382+
name: gcs-credentials
383+
readOnly: true
384+
- mountPath: /usr/local/github-credentials
385+
name: github-credentials-openshift-ci-robot-private-git-cloner
386+
readOnly: true
387+
- mountPath: /secrets/manifest-tool
388+
name: manifest-tool-local-pusher
389+
readOnly: true
390+
- mountPath: /etc/pull-secret
391+
name: pull-secret
392+
readOnly: true
393+
- mountPath: /etc/report
394+
name: result-aggregator
395+
readOnly: true
396+
serviceAccountName: ci-operator
397+
volumes:
398+
- name: boskos
399+
secret:
400+
items:
401+
- key: credentials
402+
path: credentials
403+
secretName: boskos-credentials
404+
- name: ci-pull-credentials
405+
secret:
406+
secretName: ci-pull-credentials
407+
- name: manifest-tool-local-pusher
408+
secret:
409+
secretName: manifest-tool-local-pusher
410+
- name: pull-secret
411+
secret:
412+
secretName: registry-pull-credentials
413+
- name: result-aggregator
414+
secret:
415+
secretName: result-aggregator
416+
trigger: (?m)^/test( | .* )e2e-aws-ovn-ipsec-full-natt-mode,?($|\s.*)
334417
- agent: kubernetes
335418
always_run: true
336419
branches:

0 commit comments

Comments
 (0)