Skip to content

Commit ae4f592

Browse files
authored
SPLAT-2111: create GA and tech preview jobs for vSphere multi-network (#63351)
1 parent b91317c commit ae4f592

8 files changed

+340
-5
lines changed

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ tests:
840840
cluster_profile: vsphere-elastic
841841
workflow: openshift-e2e-vsphere-staticip
842842
timeout: 6h0m0s
843-
- as: e2e-vsphere-ovn-multi-network
843+
- as: e2e-vsphere-ovn-multi-network-techpreview
844844
optional: true
845845
steps:
846846
cluster_profile: vsphere-elastic
@@ -852,6 +852,16 @@ tests:
852852
enable:
853853
- observers-resource-watch
854854
workflow: openshift-e2e-vsphere
855+
- as: e2e-vsphere-ovn-multi-network
856+
optional: true
857+
steps:
858+
cluster_profile: vsphere-elastic
859+
env:
860+
MULTI_NIC_IPI: "true"
861+
observers:
862+
enable:
863+
- observers-resource-watch
864+
workflow: openshift-e2e-vsphere
855865
- as: e2e-vsphere-ovn-multi-disk
856866
optional: true
857867
run_if_changed: vsphere

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ tests:
841841
cluster_profile: vsphere-elastic
842842
workflow: openshift-e2e-vsphere-staticip
843843
timeout: 6h0m0s
844-
- as: e2e-vsphere-ovn-multi-network
844+
- as: e2e-vsphere-ovn-multi-network-techpreview
845845
optional: true
846846
steps:
847847
cluster_profile: vsphere-elastic
@@ -853,6 +853,16 @@ tests:
853853
enable:
854854
- observers-resource-watch
855855
workflow: openshift-e2e-vsphere
856+
- as: e2e-vsphere-ovn-multi-network
857+
optional: true
858+
steps:
859+
cluster_profile: vsphere-elastic
860+
env:
861+
MULTI_NIC_IPI: "true"
862+
observers:
863+
enable:
864+
- observers-resource-watch
865+
workflow: openshift-e2e-vsphere
856866
- as: e2e-vsphere-ovn-multi-disk
857867
optional: true
858868
run_if_changed: vsphere

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ tests:
840840
cluster_profile: vsphere-elastic
841841
workflow: openshift-e2e-vsphere-staticip
842842
timeout: 6h0m0s
843-
- as: e2e-vsphere-ovn-multi-network
843+
- as: e2e-vsphere-ovn-multi-network-techpreview
844844
optional: true
845845
steps:
846846
cluster_profile: vsphere-elastic
@@ -852,6 +852,16 @@ tests:
852852
enable:
853853
- observers-resource-watch
854854
workflow: openshift-e2e-vsphere
855+
- as: e2e-vsphere-ovn-multi-network
856+
optional: true
857+
steps:
858+
cluster_profile: vsphere-elastic
859+
env:
860+
MULTI_NIC_IPI: "true"
861+
observers:
862+
enable:
863+
- observers-resource-watch
864+
workflow: openshift-e2e-vsphere
855865
- as: e2e-vsphere-ovn-multi-disk
856866
optional: true
857867
run_if_changed: vsphere

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ tests:
482482
enable:
483483
- observers-resource-watch
484484
workflow: openshift-e2e-vsphere
485-
- as: e2e-vsphere-ovn-multi-network
486-
interval: 8h
485+
- as: e2e-vsphere-ovn-multi-network-techpreview
486+
cron: '@yearly'
487487
steps:
488488
cluster_profile: vsphere-elastic
489489
env:
@@ -494,6 +494,16 @@ tests:
494494
enable:
495495
- observers-resource-watch
496496
workflow: openshift-e2e-vsphere
497+
- as: e2e-vsphere-ovn-multi-network
498+
interval: 8h
499+
steps:
500+
cluster_profile: vsphere-elastic
501+
env:
502+
MULTI_NIC_IPI: "true"
503+
observers:
504+
enable:
505+
- observers-resource-watch
506+
workflow: openshift-e2e-vsphere
497507
- as: e2e-external-vsphere-ccm
498508
cron: '@weekly'
499509
steps:

ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml

+73
Original file line numberDiff line numberDiff line change
@@ -8639,6 +8639,79 @@ presubmits:
86398639
secret:
86408640
secretName: result-aggregator
86418641
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
8642+
- agent: kubernetes
8643+
always_run: false
8644+
branches:
8645+
- ^main$
8646+
- ^main-
8647+
cluster: vsphere02
8648+
context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
8649+
decorate: true
8650+
labels:
8651+
ci-operator.openshift.io/cloud: vsphere
8652+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
8653+
ci.openshift.io/generator: prowgen
8654+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
8655+
name: pull-ci-openshift-installer-main-e2e-vsphere-ovn-multi-network-techpreview
8656+
optional: true
8657+
rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
8658+
spec:
8659+
containers:
8660+
- args:
8661+
- --gcs-upload-secret=/secrets/gcs/service-account.json
8662+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
8663+
- --lease-server-credentials-file=/etc/boskos/credentials
8664+
- --report-credentials-file=/etc/report/credentials
8665+
- --secret-dir=/secrets/ci-pull-credentials
8666+
- --target=e2e-vsphere-ovn-multi-network-techpreview
8667+
command:
8668+
- ci-operator
8669+
image: ci-operator:latest
8670+
imagePullPolicy: Always
8671+
name: ""
8672+
resources:
8673+
requests:
8674+
cpu: 10m
8675+
volumeMounts:
8676+
- mountPath: /etc/boskos
8677+
name: boskos
8678+
readOnly: true
8679+
- mountPath: /secrets/ci-pull-credentials
8680+
name: ci-pull-credentials
8681+
readOnly: true
8682+
- mountPath: /secrets/gcs
8683+
name: gcs-credentials
8684+
readOnly: true
8685+
- mountPath: /secrets/manifest-tool
8686+
name: manifest-tool-local-pusher
8687+
readOnly: true
8688+
- mountPath: /etc/pull-secret
8689+
name: pull-secret
8690+
readOnly: true
8691+
- mountPath: /etc/report
8692+
name: result-aggregator
8693+
readOnly: true
8694+
serviceAccountName: ci-operator
8695+
volumes:
8696+
- name: boskos
8697+
secret:
8698+
items:
8699+
- key: credentials
8700+
path: credentials
8701+
secretName: boskos-credentials
8702+
- name: ci-pull-credentials
8703+
secret:
8704+
secretName: ci-pull-credentials
8705+
- name: manifest-tool-local-pusher
8706+
secret:
8707+
secretName: manifest-tool-local-pusher
8708+
- name: pull-secret
8709+
secret:
8710+
secretName: registry-pull-credentials
8711+
- name: result-aggregator
8712+
secret:
8713+
secretName: result-aggregator
8714+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
86428715
- agent: kubernetes
86438716
always_run: false
86448717
branches:

ci-operator/jobs/openshift/installer/openshift-installer-release-4.19-presubmits.yaml

+73
Original file line numberDiff line numberDiff line change
@@ -8583,6 +8583,79 @@ presubmits:
85838583
secret:
85848584
secretName: result-aggregator
85858585
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
8586+
- agent: kubernetes
8587+
always_run: false
8588+
branches:
8589+
- ^release-4\.19$
8590+
- ^release-4\.19-
8591+
cluster: vsphere02
8592+
context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
8593+
decorate: true
8594+
labels:
8595+
ci-operator.openshift.io/cloud: vsphere
8596+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
8597+
ci.openshift.io/generator: prowgen
8598+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
8599+
name: pull-ci-openshift-installer-release-4.19-e2e-vsphere-ovn-multi-network-techpreview
8600+
optional: true
8601+
rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
8602+
spec:
8603+
containers:
8604+
- args:
8605+
- --gcs-upload-secret=/secrets/gcs/service-account.json
8606+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
8607+
- --lease-server-credentials-file=/etc/boskos/credentials
8608+
- --report-credentials-file=/etc/report/credentials
8609+
- --secret-dir=/secrets/ci-pull-credentials
8610+
- --target=e2e-vsphere-ovn-multi-network-techpreview
8611+
command:
8612+
- ci-operator
8613+
image: ci-operator:latest
8614+
imagePullPolicy: Always
8615+
name: ""
8616+
resources:
8617+
requests:
8618+
cpu: 10m
8619+
volumeMounts:
8620+
- mountPath: /etc/boskos
8621+
name: boskos
8622+
readOnly: true
8623+
- mountPath: /secrets/ci-pull-credentials
8624+
name: ci-pull-credentials
8625+
readOnly: true
8626+
- mountPath: /secrets/gcs
8627+
name: gcs-credentials
8628+
readOnly: true
8629+
- mountPath: /secrets/manifest-tool
8630+
name: manifest-tool-local-pusher
8631+
readOnly: true
8632+
- mountPath: /etc/pull-secret
8633+
name: pull-secret
8634+
readOnly: true
8635+
- mountPath: /etc/report
8636+
name: result-aggregator
8637+
readOnly: true
8638+
serviceAccountName: ci-operator
8639+
volumes:
8640+
- name: boskos
8641+
secret:
8642+
items:
8643+
- key: credentials
8644+
path: credentials
8645+
secretName: boskos-credentials
8646+
- name: ci-pull-credentials
8647+
secret:
8648+
secretName: ci-pull-credentials
8649+
- name: manifest-tool-local-pusher
8650+
secret:
8651+
secretName: manifest-tool-local-pusher
8652+
- name: pull-secret
8653+
secret:
8654+
secretName: registry-pull-credentials
8655+
- name: result-aggregator
8656+
secret:
8657+
secretName: result-aggregator
8658+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
85868659
- agent: kubernetes
85878660
always_run: false
85888661
branches:

ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml

+73
Original file line numberDiff line numberDiff line change
@@ -8584,6 +8584,79 @@ presubmits:
85848584
secret:
85858585
secretName: result-aggregator
85868586
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network,?($|\s.*)
8587+
- agent: kubernetes
8588+
always_run: false
8589+
branches:
8590+
- ^release-4\.20$
8591+
- ^release-4\.20-
8592+
cluster: vsphere02
8593+
context: ci/prow/e2e-vsphere-ovn-multi-network-techpreview
8594+
decorate: true
8595+
labels:
8596+
ci-operator.openshift.io/cloud: vsphere
8597+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
8598+
ci.openshift.io/generator: prowgen
8599+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
8600+
name: pull-ci-openshift-installer-release-4.20-e2e-vsphere-ovn-multi-network-techpreview
8601+
optional: true
8602+
rerun_command: /test e2e-vsphere-ovn-multi-network-techpreview
8603+
spec:
8604+
containers:
8605+
- args:
8606+
- --gcs-upload-secret=/secrets/gcs/service-account.json
8607+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
8608+
- --lease-server-credentials-file=/etc/boskos/credentials
8609+
- --report-credentials-file=/etc/report/credentials
8610+
- --secret-dir=/secrets/ci-pull-credentials
8611+
- --target=e2e-vsphere-ovn-multi-network-techpreview
8612+
command:
8613+
- ci-operator
8614+
image: ci-operator:latest
8615+
imagePullPolicy: Always
8616+
name: ""
8617+
resources:
8618+
requests:
8619+
cpu: 10m
8620+
volumeMounts:
8621+
- mountPath: /etc/boskos
8622+
name: boskos
8623+
readOnly: true
8624+
- mountPath: /secrets/ci-pull-credentials
8625+
name: ci-pull-credentials
8626+
readOnly: true
8627+
- mountPath: /secrets/gcs
8628+
name: gcs-credentials
8629+
readOnly: true
8630+
- mountPath: /secrets/manifest-tool
8631+
name: manifest-tool-local-pusher
8632+
readOnly: true
8633+
- mountPath: /etc/pull-secret
8634+
name: pull-secret
8635+
readOnly: true
8636+
- mountPath: /etc/report
8637+
name: result-aggregator
8638+
readOnly: true
8639+
serviceAccountName: ci-operator
8640+
volumes:
8641+
- name: boskos
8642+
secret:
8643+
items:
8644+
- key: credentials
8645+
path: credentials
8646+
secretName: boskos-credentials
8647+
- name: ci-pull-credentials
8648+
secret:
8649+
secretName: ci-pull-credentials
8650+
- name: manifest-tool-local-pusher
8651+
secret:
8652+
secretName: manifest-tool-local-pusher
8653+
- name: pull-secret
8654+
secret:
8655+
secretName: registry-pull-credentials
8656+
- name: result-aggregator
8657+
secret:
8658+
secretName: result-aggregator
8659+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-multi-network-techpreview,?($|\s.*)
85878660
- agent: kubernetes
85888661
always_run: false
85898662
branches:

0 commit comments

Comments
 (0)