Skip to content

HCP/OSP: introduce new NFV workflow + cleanup #58694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 5 commits into from
Jan 13, 2025
Merged

HCP/OSP: introduce new NFV workflow + cleanup #58694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce6f4c5
dnsrecords: fix a typo
EmilienM Jan 9, 2025
ebe9d36
HCP/OSP: introduce new NFV workflow
EmilienM Nov 11, 2024
156463f
Remove HYPERSHIFT_ZONES where we don't it
EmilienM Dec 11, 2024
37f9f0c
openstack/nfv: remove 4.9/4.10 specifics
EmilienM Dec 11, 2024
8fc9933
`make update` + missing slack
EmilienM Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...iv/cluster-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...er-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand Down
1 change: 0 additions & 1 deletion ...er-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...er-api-provider-openstack/openshift-priv-cluster-api-provider-openstack-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -271,15 +270,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
Comment thread
EmilienM marked this conversation as resolved.
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
7 changes: 2 additions & 5 deletions ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand All @@ -206,15 +205,13 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
Comment thread
EmilienM marked this conversation as resolved.
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -264,15 +263,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -263,15 +262,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
1 change: 0 additions & 1 deletion ...openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...ift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand Down
1 change: 0 additions & 1 deletion ...ift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...ift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...enshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand Down
1 change: 0 additions & 1 deletion ...cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -269,15 +268,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
7 changes: 2 additions & 5 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand All @@ -205,15 +204,13 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
14 changes: 13 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.18__periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand All @@ -206,6 +205,19 @@ tests:
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
- as: e2e-openstack-aws-nfv
minimum_interval: 96h
steps:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
NFV_NODEPOOLS: "true"
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
workflow: hypershift-openstack-aws-nfv
- as: e2e-openstack-aws-conformance
minimum_interval: 72h
steps:
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -263,15 +262,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
13 changes: 12 additions & 1 deletion ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19__periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,25 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-vexxhost-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
- as: e2e-openstack-aws-nfv
minimum_interval: 96h
steps:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
workflow: hypershift-openstack-aws-nfv
- as: e2e-openstack-aws-conformance
minimum_interval: 72h
steps:
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand All @@ -262,15 +261,12 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-nfv
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
NFV_NODEPOOLS: "true"
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
resource_type: openstack-nfv-quota-slice
test:
- chain: hypershift-openstack-e2e
workflow: hypershift-aws-e2e-external
workflow: hypershift-openstack-aws-nfv
- always_run: false
as: e2e-openstack-aws-conformance
optional: true
Expand Down
1 change: 0 additions & 1 deletion ...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...fig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
RHCOS_IMAGE_NAME: rhcos-4.18-hcp-nodepool
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
Expand Down
1 change: 0 additions & 1 deletion ...fig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
1 change: 0 additions & 1 deletion ...fig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ tests:
cluster_profile: hypershift
env:
CLUSTER_TYPE_OVERRIDE: openstack-vexxhost
HYPERSHIFT_ZONES: us-east-1a,us-east-1b,us-east-1c
TECH_PREVIEW_NO_UPGRADE: "true"
leases:
- env: OPENSTACK_CLOUD
Expand Down
Loading