Skip to content

Commit da56e20

Browse files
committed
Add vSphere and Azure tech preview, disk setup job
This commit adds two additional jobs to test the disk setup e2e before merging.
1 parent 40fa044 commit da56e20

File tree

2 files changed

+175
-0
lines changed

2 files changed

+175
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,31 @@ tests:
704704
TEST_SUITE: openshift/machine-config-operator/disruptive
705705
workflow: openshift-e2e-gcp
706706
timeout: 6h0m0s
707+
- always_run: false
708+
as: e2e-azure-ovn-multidisk-techpreview
709+
optional: true
710+
steps:
711+
cluster_profile: azure4
712+
env:
713+
AZURE_CONTROL_PLANE_MULTIDISK_TYPE: etcd
714+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
715+
FEATURE_SET: TechPreviewNoUpgrade
716+
observers:
717+
enable:
718+
- observers-resource-watch
719+
workflow: openshift-e2e-azure-multidisk
720+
timeout: 6h0m0s
721+
- always_run: false
722+
as: e2e-vsphere-ovn-disk-setup-techpreview
723+
optional: true
724+
steps:
725+
cluster_profile: vsphere-elastic
726+
env:
727+
ADDITIONAL_DISK: "true"
728+
DISK_SETUP: "true"
729+
FEATURE_SET: TechPreviewNoUpgrade
730+
workflow: openshift-e2e-vsphere
731+
timeout: 6h0m0s
707732
zz_generated_metadata:
708733
branch: main
709734
org: openshift

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,81 @@ presubmits:
15321532
secret:
15331533
secretName: result-aggregator
15341534
trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
1535+
- agent: kubernetes
1536+
always_run: false
1537+
branches:
1538+
- ^main$
1539+
- ^main-
1540+
cluster: build10
1541+
context: ci/prow/e2e-azure-ovn-multidisk-techpreview
1542+
decorate: true
1543+
decoration_config:
1544+
timeout: 6h0m0s
1545+
labels:
1546+
ci-operator.openshift.io/cloud: azure4
1547+
ci-operator.openshift.io/cloud-cluster-profile: azure4
1548+
ci.openshift.io/generator: prowgen
1549+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1550+
name: pull-ci-openshift-machine-config-operator-main-e2e-azure-ovn-multidisk-techpreview
1551+
optional: true
1552+
rerun_command: /test e2e-azure-ovn-multidisk-techpreview
1553+
spec:
1554+
containers:
1555+
- args:
1556+
- --gcs-upload-secret=/secrets/gcs/service-account.json
1557+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
1558+
- --lease-server-credentials-file=/etc/boskos/credentials
1559+
- --report-credentials-file=/etc/report/credentials
1560+
- --secret-dir=/secrets/ci-pull-credentials
1561+
- --target=e2e-azure-ovn-multidisk-techpreview
1562+
command:
1563+
- ci-operator
1564+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
1565+
imagePullPolicy: Always
1566+
name: ""
1567+
resources:
1568+
requests:
1569+
cpu: 10m
1570+
volumeMounts:
1571+
- mountPath: /etc/boskos
1572+
name: boskos
1573+
readOnly: true
1574+
- mountPath: /secrets/ci-pull-credentials
1575+
name: ci-pull-credentials
1576+
readOnly: true
1577+
- mountPath: /secrets/gcs
1578+
name: gcs-credentials
1579+
readOnly: true
1580+
- mountPath: /secrets/manifest-tool
1581+
name: manifest-tool-local-pusher
1582+
readOnly: true
1583+
- mountPath: /etc/pull-secret
1584+
name: pull-secret
1585+
readOnly: true
1586+
- mountPath: /etc/report
1587+
name: result-aggregator
1588+
readOnly: true
1589+
serviceAccountName: ci-operator
1590+
volumes:
1591+
- name: boskos
1592+
secret:
1593+
items:
1594+
- key: credentials
1595+
path: credentials
1596+
secretName: boskos-credentials
1597+
- name: ci-pull-credentials
1598+
secret:
1599+
secretName: ci-pull-credentials
1600+
- name: manifest-tool-local-pusher
1601+
secret:
1602+
secretName: manifest-tool-local-pusher
1603+
- name: pull-secret
1604+
secret:
1605+
secretName: registry-pull-credentials
1606+
- name: result-aggregator
1607+
secret:
1608+
secretName: result-aggregator
1609+
trigger: (?m)^/test( | .* )e2e-azure-ovn-multidisk-techpreview,?($|\s.*)
15351610
- agent: kubernetes
15361611
always_run: false
15371612
branches:
@@ -3892,6 +3967,81 @@ presubmits:
38923967
secret:
38933968
secretName: result-aggregator
38943969
trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*)
3970+
- agent: kubernetes
3971+
always_run: false
3972+
branches:
3973+
- ^main$
3974+
- ^main-
3975+
cluster: vsphere02
3976+
context: ci/prow/e2e-vsphere-ovn-disk-setup-techpreview
3977+
decorate: true
3978+
decoration_config:
3979+
timeout: 6h0m0s
3980+
labels:
3981+
ci-operator.openshift.io/cloud: vsphere
3982+
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
3983+
ci.openshift.io/generator: prowgen
3984+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
3985+
name: pull-ci-openshift-machine-config-operator-main-e2e-vsphere-ovn-disk-setup-techpreview
3986+
optional: true
3987+
rerun_command: /test e2e-vsphere-ovn-disk-setup-techpreview
3988+
spec:
3989+
containers:
3990+
- args:
3991+
- --gcs-upload-secret=/secrets/gcs/service-account.json
3992+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
3993+
- --lease-server-credentials-file=/etc/boskos/credentials
3994+
- --report-credentials-file=/etc/report/credentials
3995+
- --secret-dir=/secrets/ci-pull-credentials
3996+
- --target=e2e-vsphere-ovn-disk-setup-techpreview
3997+
command:
3998+
- ci-operator
3999+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
4000+
imagePullPolicy: Always
4001+
name: ""
4002+
resources:
4003+
requests:
4004+
cpu: 10m
4005+
volumeMounts:
4006+
- mountPath: /etc/boskos
4007+
name: boskos
4008+
readOnly: true
4009+
- mountPath: /secrets/ci-pull-credentials
4010+
name: ci-pull-credentials
4011+
readOnly: true
4012+
- mountPath: /secrets/gcs
4013+
name: gcs-credentials
4014+
readOnly: true
4015+
- mountPath: /secrets/manifest-tool
4016+
name: manifest-tool-local-pusher
4017+
readOnly: true
4018+
- mountPath: /etc/pull-secret
4019+
name: pull-secret
4020+
readOnly: true
4021+
- mountPath: /etc/report
4022+
name: result-aggregator
4023+
readOnly: true
4024+
serviceAccountName: ci-operator
4025+
volumes:
4026+
- name: boskos
4027+
secret:
4028+
items:
4029+
- key: credentials
4030+
path: credentials
4031+
secretName: boskos-credentials
4032+
- name: ci-pull-credentials
4033+
secret:
4034+
secretName: ci-pull-credentials
4035+
- name: manifest-tool-local-pusher
4036+
secret:
4037+
secretName: manifest-tool-local-pusher
4038+
- name: pull-secret
4039+
secret:
4040+
secretName: registry-pull-credentials
4041+
- name: result-aggregator
4042+
secret:
4043+
secretName: result-aggregator
4044+
trigger: (?m)^/test( | .* )e2e-vsphere-ovn-disk-setup-techpreview,?($|\s.*)
38954045
- agent: kubernetes
38964046
always_run: false
38974047
branches:

0 commit comments

Comments
 (0)