Skip to content

Commit

Permalink
SPLAT-1738: add support for provisioning nested environments (#57681)
Browse files Browse the repository at this point in the history
* remove multi-nic

* fix vcenter IP not retrieved

* test with cluster based zones

* enable host groups in workflow and install-config

* add installer presubmits

* fix datastore path

* create dedicated nested workflow

* switch to python and define topology in platform spec
  • Loading branch information
rvanderp3 authored Jan 16, 2025
1 parent 96e502d commit 5dd8439
Show file tree
Hide file tree
Showing 35 changed files with 861 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ base_images:
name: golangci-lint
namespace: ci
tag: v1.59.0
nested-environment-builder:
name: nested-environment-builder
namespace: ci
tag: latest
ocp_4.10_cli:
name: "4.19"
namespace: ocp
Expand Down Expand Up @@ -831,6 +835,14 @@ tests:
In-tree Volumes \[Driver: vsphere\] \[Testpattern: Pre-provisioned PV'
workflow: openshift-e2e-vsphere
timeout: 6h0m0s
- as: e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
steps:
cluster_profile: vsphere-elastic
observers:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere-host-groups
- as: e2e-vsphere-static-ovn
optional: true
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ base_images:
name: golangci-lint
namespace: ci
tag: v1.59.0
nested-environment-builder:
name: nested-environment-builder
namespace: ci
tag: latest
ocp_4.10_cli:
name: "4.18"
namespace: ocp
Expand Down Expand Up @@ -831,6 +835,14 @@ tests:
In-tree Volumes \[Driver: vsphere\] \[Testpattern: Pre-provisioned PV'
workflow: openshift-e2e-vsphere
timeout: 6h0m0s
- as: e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
steps:
cluster_profile: vsphere-elastic
observers:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere-host-groups
- as: e2e-vsphere-static-ovn
optional: true
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ base_images:
name: golangci-lint
namespace: ci
tag: v1.59.0
nested-environment-builder:
name: nested-environment-builder
namespace: ci
tag: latest
ocp_4.10_cli:
name: "4.19"
namespace: ocp
Expand Down Expand Up @@ -832,6 +836,14 @@ tests:
In-tree Volumes \[Driver: vsphere\] \[Testpattern: Pre-provisioned PV'
workflow: openshift-e2e-vsphere
timeout: 6h0m0s
- as: e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
steps:
cluster_profile: vsphere-elastic
observers:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere-host-groups
- as: e2e-vsphere-static-ovn
optional: true
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,14 @@ tests:
cluster_profile: openstack-vexxhost
workflow: openshift-manifests-openstack
timeout: 6h0m0s
- as: e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
steps:
cluster_profile: vsphere-elastic
observers:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere-host-groups
- as: e2e-vsphere-ovn
run_if_changed: vsphere
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ base_images:
name: "4.18"
namespace: ocp
tag: libvirt-installer
nested-environment-builder:
name: nested-environment-builder
namespace: ci
tag: latest
rosa-aws-cli:
name: rosa-aws-cli
namespace: ci
Expand Down Expand Up @@ -458,6 +462,14 @@ tests:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere
- as: e2e-vsphere-ovn-host-groups
cron: '@yearly'
steps:
cluster_profile: vsphere-elastic
observers:
enable:
- observers-resource-watch
workflow: openshift-e2e-vsphere-host-groups
- as: e2e-vsphere-ovn-multi-network
interval: 24h
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8160,6 +8160,79 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-powervs-capi-ovn,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: vsphere02
context: ci/prow/e2e-vsphere-host-groups-ovn-custom-no-upgrade
decorate: true
labels:
ci-operator.openshift.io/cloud: vsphere
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-main-e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
rerun_command: /test e2e-vsphere-host-groups-ovn-custom-no-upgrade
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-vsphere-host-groups-ovn-custom-no-upgrade
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-vsphere-host-groups-ovn-custom-no-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8160,6 +8160,79 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-powervs-capi-ovn,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^release-4\.18$
- ^release-4\.18-
cluster: vsphere02
context: ci/prow/e2e-vsphere-host-groups-ovn-custom-no-upgrade
decorate: true
labels:
ci-operator.openshift.io/cloud: vsphere
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-release-4.18-e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
rerun_command: /test e2e-vsphere-host-groups-ovn-custom-no-upgrade
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-vsphere-host-groups-ovn-custom-no-upgrade
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-vsphere-host-groups-ovn-custom-no-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8159,6 +8159,79 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-powervs-capi-ovn,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^release-4\.19$
- ^release-4\.19-
cluster: vsphere02
context: ci/prow/e2e-vsphere-host-groups-ovn-custom-no-upgrade
decorate: true
labels:
ci-operator.openshift.io/cloud: vsphere
ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-release-4.19-e2e-vsphere-host-groups-ovn-custom-no-upgrade
optional: true
rerun_command: /test e2e-vsphere-host-groups-ovn-custom-no-upgrade
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-vsphere-host-groups-ovn-custom-no-upgrade
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-vsphere-host-groups-ovn-custom-no-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
Loading

0 comments on commit 5dd8439

Please sign in to comment.