Skip to content

Commit 44f2830

Browse files
committed
Added new jobs for vSphere upi hybrid env and csi driver project
1 parent be68cbf commit 44f2830

14 files changed

+379
-0
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,16 @@ tests:
658658
NETWORK_TYPE: multi-tenant
659659
workflow: openshift-e2e-vsphere-hybrid-env
660660
timeout: 6h0m0s
661+
- as: e2e-vsphere-ovn-upi-hybrid-env
662+
cron: '@yearly'
663+
steps:
664+
cluster_profile: vsphere-elastic
665+
env:
666+
FEATURE_GATES: '["VSphereMixedNodeEnv=true"]'
667+
FEATURE_SET: CustomNoUpgrade
668+
NETWORK_TYPE: multi-tenant
669+
workflow: openshift-e2e-vsphere-upi-hybrid-env
670+
timeout: 6h0m0s
661671
- as: e2e-aws-ovn-fips
662672
interval: 168h
663673
steps:

ci-operator/config/openshift/vmware-vsphere-csi-driver-operator/openshift-vmware-vsphere-csi-driver-operator-main.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ base_images:
1111
name: tests-private
1212
namespace: ci
1313
tag: "4.19"
14+
virtctl:
15+
name: "4.20"
16+
namespace: ocp
17+
tag: virtctl
1418
build_root:
1519
from_repository: true
1620
images:
@@ -83,6 +87,13 @@ tests:
8387
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
8488
on the same node
8589
workflow: openshift-e2e-vsphere-csi
90+
- as: e2e-vsphere-ovn-hybrid-env
91+
steps:
92+
cluster_profile: vsphere-elastic
93+
env:
94+
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
95+
on the same node
96+
workflow: openshift-e2e-vsphere-hybrid-env
8697
- as: e2e-vsphere-ovn-upgrade
8798
steps:
8899
cluster_profile: vsphere-elastic

ci-operator/config/openshift/vmware-vsphere-csi-driver-operator/openshift-vmware-vsphere-csi-driver-operator-release-4.20.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ base_images:
1111
name: tests-private
1212
namespace: ci
1313
tag: "4.19"
14+
virtctl:
15+
name: "4.20"
16+
namespace: ocp
17+
tag: virtctl
1418
build_root:
1519
from_repository: true
1620
images:
@@ -84,6 +88,13 @@ tests:
8488
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
8589
on the same node
8690
workflow: openshift-e2e-vsphere-csi
91+
- as: e2e-vsphere-ovn-hybrid-env
92+
steps:
93+
cluster_profile: vsphere-elastic
94+
env:
95+
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
96+
on the same node
97+
workflow: openshift-e2e-vsphere-hybrid-env
8798
- as: e2e-vsphere-ovn-upgrade
8899
steps:
89100
cluster_profile: vsphere-elastic

ci-operator/config/openshift/vmware-vsphere-csi-driver-operator/openshift-vmware-vsphere-csi-driver-operator-release-4.21.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ base_images:
1111
name: tests-private
1212
namespace: ci
1313
tag: "4.19"
14+
virtctl:
15+
name: "4.20"
16+
namespace: ocp
17+
tag: virtctl
1418
build_root:
1519
from_repository: true
1620
images:
@@ -83,6 +87,13 @@ tests:
8387
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
8488
on the same node
8589
workflow: openshift-e2e-vsphere-csi
90+
- as: e2e-vsphere-ovn-hybrid-env
91+
steps:
92+
cluster_profile: vsphere-elastic
93+
env:
94+
TEST_SKIPS: provisioning should mount multiple PV pointing to the same storage
95+
on the same node
96+
workflow: openshift-e2e-vsphere-hybrid-env
8697
- as: e2e-vsphere-ovn-upgrade
8798
steps:
8899
cluster_profile: vsphere-elastic

ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155952,6 +155952,83 @@ periodics:
155952155952
- name: result-aggregator
155953155953
secret:
155954155954
secretName: result-aggregator
155955+
- agent: kubernetes
155956+
cluster: vsphere02
155957+
cron: '@yearly'
155958+
decorate: true
155959+
decoration_config:
155960+
skip_cloning: true
155961+
timeout: 6h0m0s
155962+
extra_refs:
155963+
- base_ref: master
155964+
org: openshift
155965+
repo: release
155966+
labels:
155967+
ci-operator.openshift.io/cloud: vsphere
155968+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
155969+
ci-operator.openshift.io/variant: nightly-4.20
155970+
ci.openshift.io/generator: prowgen
155971+
ci.openshift.io/no-builds: "true"
155972+
job-release: "4.20"
155973+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
155974+
name: periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-upi-hybrid-env
155975+
spec:
155976+
containers:
155977+
- args:
155978+
- --gcs-upload-secret=/secrets/gcs/service-account.json
155979+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
155980+
- --lease-server-credentials-file=/etc/boskos/credentials
155981+
- --report-credentials-file=/etc/report/credentials
155982+
- --secret-dir=/secrets/ci-pull-credentials
155983+
- --target=e2e-vsphere-ovn-upi-hybrid-env
155984+
- --variant=nightly-4.20
155985+
command:
155986+
- ci-operator
155987+
image: ci-operator:latest
155988+
imagePullPolicy: Always
155989+
name: ""
155990+
resources:
155991+
requests:
155992+
cpu: 10m
155993+
volumeMounts:
155994+
- mountPath: /etc/boskos
155995+
name: boskos
155996+
readOnly: true
155997+
- mountPath: /secrets/ci-pull-credentials
155998+
name: ci-pull-credentials
155999+
readOnly: true
156000+
- mountPath: /secrets/gcs
156001+
name: gcs-credentials
156002+
readOnly: true
156003+
- mountPath: /secrets/manifest-tool
156004+
name: manifest-tool-local-pusher
156005+
readOnly: true
156006+
- mountPath: /etc/pull-secret
156007+
name: pull-secret
156008+
readOnly: true
156009+
- mountPath: /etc/report
156010+
name: result-aggregator
156011+
readOnly: true
156012+
serviceAccountName: ci-operator
156013+
volumes:
156014+
- name: boskos
156015+
secret:
156016+
items:
156017+
- key: credentials
156018+
path: credentials
156019+
secretName: boskos-credentials
156020+
- name: ci-pull-credentials
156021+
secret:
156022+
secretName: ci-pull-credentials
156023+
- name: manifest-tool-local-pusher
156024+
secret:
156025+
secretName: manifest-tool-local-pusher
156026+
- name: pull-secret
156027+
secret:
156028+
secretName: registry-pull-credentials
156029+
- name: result-aggregator
156030+
secret:
156031+
secretName: result-aggregator
155955156032
- agent: kubernetes
155956156033
cluster: vsphere02
155957156034
cron: 34 2 * * *

ci-operator/jobs/openshift/vmware-vsphere-csi-driver-operator/openshift-vmware-vsphere-csi-driver-operator-main-presubmits.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,78 @@ presubmits:
289289
secret:
290290
secretName: result-aggregator
291291
trigger: (?m)^/test( | .* )e2e-vsphere-operator-test,?($|\s.*)
292+
- agent: kubernetes
293+
always_run: true
294+
branches:
295+
- ^main$
296+
- ^main-
297+
cluster: vsphere02
298+
context: ci/prow/e2e-vsphere-ovn-hybrid-env
299+
decorate: true
300+
labels:
301+
ci-operator.openshift.io/cloud: vsphere
302+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
303+
ci.openshift.io/generator: prowgen
304+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
305+
name: pull-ci-openshift-vmware-vsphere-csi-driver-operator-main-e2e-vsphere-ovn-hybrid-env
306+
rerun_command: /test e2e-vsphere-ovn-hybrid-env
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --lease-server-credentials-file=/etc/boskos/credentials
313+
- --report-credentials-file=/etc/report/credentials
314+
- --secret-dir=/secrets/ci-pull-credentials
315+
- --target=e2e-vsphere-ovn-hybrid-env
316+
command:
317+
- ci-operator
318+
image: ci-operator:latest
319+
imagePullPolicy: Always
320+
name: ""
321+
resources:
322+
requests:
323+
cpu: 10m
324+
volumeMounts:
325+
- mountPath: /etc/boskos
326+
name: boskos
327+
readOnly: true
328+
- mountPath: /secrets/ci-pull-credentials
329+
name: ci-pull-credentials
330+
readOnly: true
331+
- mountPath: /secrets/gcs
332+
name: gcs-credentials
333+
readOnly: true
334+
- mountPath: /secrets/manifest-tool
335+
name: manifest-tool-local-pusher
336+
readOnly: true
337+
- mountPath: /etc/pull-secret
338+
name: pull-secret
339+
readOnly: true
340+
- mountPath: /etc/report
341+
name: result-aggregator
342+
readOnly: true
343+
serviceAccountName: ci-operator
344+
volumes:
345+
- name: boskos
346+
secret:
347+
items:
348+
- key: credentials
349+
path: credentials
350+
secretName: boskos-credentials
351+
- name: ci-pull-credentials
352+
secret:
353+
secretName: ci-pull-credentials
354+
- name: manifest-tool-local-pusher
355+
secret:
356+
secretName: manifest-tool-local-pusher
357+
- name: pull-secret
358+
secret:
359+
secretName: registry-pull-credentials
360+
- name: result-aggregator
361+
secret:
362+
secretName: result-aggregator
363+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-hybrid-env,?($|\s.*)
292364
- agent: kubernetes
293365
always_run: true
294366
branches:

ci-operator/jobs/openshift/vmware-vsphere-csi-driver-operator/openshift-vmware-vsphere-csi-driver-operator-release-4.20-presubmits.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,78 @@ presubmits:
289289
secret:
290290
secretName: result-aggregator
291291
trigger: (?m)^/test( | .* )e2e-vsphere-operator-test,?($|\s.*)
292+
- agent: kubernetes
293+
always_run: true
294+
branches:
295+
- ^release-4\.20$
296+
- ^release-4\.20-
297+
cluster: vsphere02
298+
context: ci/prow/e2e-vsphere-ovn-hybrid-env
299+
decorate: true
300+
labels:
301+
ci-operator.openshift.io/cloud: vsphere
302+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
303+
ci.openshift.io/generator: prowgen
304+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
305+
name: pull-ci-openshift-vmware-vsphere-csi-driver-operator-release-4.20-e2e-vsphere-ovn-hybrid-env
306+
rerun_command: /test e2e-vsphere-ovn-hybrid-env
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --lease-server-credentials-file=/etc/boskos/credentials
313+
- --report-credentials-file=/etc/report/credentials
314+
- --secret-dir=/secrets/ci-pull-credentials
315+
- --target=e2e-vsphere-ovn-hybrid-env
316+
command:
317+
- ci-operator
318+
image: ci-operator:latest
319+
imagePullPolicy: Always
320+
name: ""
321+
resources:
322+
requests:
323+
cpu: 10m
324+
volumeMounts:
325+
- mountPath: /etc/boskos
326+
name: boskos
327+
readOnly: true
328+
- mountPath: /secrets/ci-pull-credentials
329+
name: ci-pull-credentials
330+
readOnly: true
331+
- mountPath: /secrets/gcs
332+
name: gcs-credentials
333+
readOnly: true
334+
- mountPath: /secrets/manifest-tool
335+
name: manifest-tool-local-pusher
336+
readOnly: true
337+
- mountPath: /etc/pull-secret
338+
name: pull-secret
339+
readOnly: true
340+
- mountPath: /etc/report
341+
name: result-aggregator
342+
readOnly: true
343+
serviceAccountName: ci-operator
344+
volumes:
345+
- name: boskos
346+
secret:
347+
items:
348+
- key: credentials
349+
path: credentials
350+
secretName: boskos-credentials
351+
- name: ci-pull-credentials
352+
secret:
353+
secretName: ci-pull-credentials
354+
- name: manifest-tool-local-pusher
355+
secret:
356+
secretName: manifest-tool-local-pusher
357+
- name: pull-secret
358+
secret:
359+
secretName: registry-pull-credentials
360+
- name: result-aggregator
361+
secret:
362+
secretName: result-aggregator
363+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-hybrid-env,?($|\s.*)
292364
- agent: kubernetes
293365
always_run: true
294366
branches:

0 commit comments

Comments
 (0)