Skip to content

OSASINFRA-3609: Use csi-operator for building openstack-cinder CSI driver #56812

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 3 commits into from
Sep 20, 2024
Merged

OSASINFRA-3609: Use csi-operator for building openstack-cinder CSI driver #56812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74c3c7a
Reorder openshift-csi-operator-* files
stephenfin Sep 17, 2024
580dacf
OSASINFRA-3608: Build openstack-cinder from csi-operator
stephenfin Sep 19, 2024
a81fc34
csi-operator: Only run Cinder jobs on Cinder changes
stephenfin Sep 19, 2024
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
48 changes: 39 additions & 9 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-disk-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.azure-file
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -130,9 +124,15 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-file-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.openstack-cinder
inputs:
ocp_4.18_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.18:base-rhel9
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: openstack-cinder-csi-driver-operator
- dockerfile_path: Dockerfile.samba
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -148,6 +148,18 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: smb-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: openstack-cinder-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: smb-csi-driver-operator-test
Expand Down Expand Up @@ -294,6 +306,24 @@ tests:
env:
TEST_SCENARIOS: \[CSI-Driver\]|\[Azure-File-CSI-Driver\]|\[Azure-File-CSI-Driver-Operator\]
workflow: openshift-e2e-azure-csi-extended
- as: e2e-openstack
optional: true
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
steps:
cluster_profile: openstack-vexxhost
env:
BASE_DOMAIN: shiftstack.devcluster.openshift.com
CONFIG_TYPE: minimal
TEST_SUITE: experimental/reliability/minimal
workflow: openshift-e2e-openstack-ipi
- as: e2e-openstack-cinder-csi
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
Copy link
Member

@gnufied gnufied Sep 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice. this would be useful for other operators too!

Copy link
Contributor Author

@stephenfin stephenfin Sep 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may need to be a bit more involved, since conceivably any chance to the "common" code could affect an individual driver. However, we could just rely on the fact that (a) changes to the asset generation will require an asset generation run (I assume there's a job to check that - I have yet to look) and (b) if it's a programming error the build will likely fail. In any case, a can to kick down the road slightly until we start reworking this driver to take advantage of the generator.

steps:
cluster_profile: openstack-vh-mecha-central
env:
TEST_SKIPS: should concurrently access the volume and restored snapshot from
pods on the same node
workflow: openshift-e2e-openstack-csi-cinder
- as: smb-operator-e2e
optional: true
steps:
Expand Down
11 changes: 11 additions & 0 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-master__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ images:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-disk-csi-driver-operator
- build_args:
- name: TAGS
value: scos
dockerfile_path: Dockerfile.openstack-cinder
from: origin_scos-4.18_base-stream9
inputs:
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
as:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: openstack-cinder-csi-driver-operator
promotion:
to:
- name: scos-4.18
Expand Down
48 changes: 39 additions & 9 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-disk-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.azure-file
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -130,9 +124,15 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-file-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.openstack-cinder
inputs:
ocp_4.18_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.18:base-rhel9
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: openstack-cinder-csi-driver-operator
- dockerfile_path: Dockerfile.samba
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -148,6 +148,18 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: smb-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: openstack-cinder-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: smb-csi-driver-operator-test
Expand Down Expand Up @@ -295,6 +307,24 @@ tests:
env:
TEST_SCENARIOS: \[CSI-Driver\]|\[Azure-File-CSI-Driver\]|\[Azure-File-CSI-Driver-Operator\]
workflow: openshift-e2e-azure-csi-extended
- as: e2e-openstack
optional: true
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
steps:
cluster_profile: openstack-vexxhost
env:
BASE_DOMAIN: shiftstack.devcluster.openshift.com
CONFIG_TYPE: minimal
TEST_SUITE: experimental/reliability/minimal
workflow: openshift-e2e-openstack-ipi
- as: e2e-openstack-cinder-csi
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
steps:
cluster_profile: openstack-vh-mecha-central
env:
TEST_SKIPS: should concurrently access the volume and restored snapshot from
pods on the same node
workflow: openshift-e2e-openstack-csi-cinder
- as: smb-operator-e2e
optional: true
steps:
Expand Down
48 changes: 39 additions & 9 deletions ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-disk-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.azure-file
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -130,9 +124,15 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: azure-file-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.openstack-cinder
inputs:
ocp_4.18_base-rhel9:
as:
- registry.ci.openshift.org/ocp/4.18:base-rhel9
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: openstack-cinder-csi-driver-operator
- dockerfile_path: Dockerfile.samba
inputs:
ocp_4.17_base-rhel9:
Expand All @@ -148,6 +148,18 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
to: smb-csi-driver-operator
- dockerfile_path: Dockerfile.test
from: src
to: aws-ebs-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-disk-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: azure-file-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: openstack-cinder-csi-driver-operator-test
- dockerfile_path: Dockerfile.test
from: src
to: smb-csi-driver-operator-test
Expand Down Expand Up @@ -294,6 +306,24 @@ tests:
env:
TEST_SCENARIOS: \[CSI-Driver\]|\[Azure-File-CSI-Driver\]|\[Azure-File-CSI-Driver-Operator\]
workflow: openshift-e2e-azure-csi-extended
- as: e2e-openstack
optional: true
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
steps:
cluster_profile: openstack-vexxhost
env:
BASE_DOMAIN: shiftstack.devcluster.openshift.com
CONFIG_TYPE: minimal
TEST_SUITE: experimental/reliability/minimal
workflow: openshift-e2e-openstack-ipi
- as: e2e-openstack-cinder-csi
run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*)
steps:
cluster_profile: openstack-vh-mecha-central
env:
TEST_SKIPS: should concurrently access the volume and restored snapshot from
pods on the same node
workflow: openshift-e2e-openstack-csi-cinder
- as: smb-operator-e2e
optional: true
steps:
Expand Down
79 changes: 0 additions & 79 deletions ...ack-cinder-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-master.yaml
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ...-csi-driver-operator/openshift-openstack-cinder-csi-driver-operator-master__okd-scos.yaml
View file
Open in desktop

This file was deleted.

Loading