OCPBUGS-80930 | Add VolumeAttributesClass e2e test for Azure Disk CSI driver with UltraSSD support

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

@@ -303,6 +303,15 @@ tests:
   steps:
     cluster_profile: openshift-org-azure
     workflow: openshift-e2e-azure-manual-oidc-workload-identity
+- always_run: false
+  as: e2e-azure-csi-volumeattributesclass
+  optional: true
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      TEST_ARGS: --run=VolumeAttributesClass
+      TEST_SUITE: all
+    workflow: openshift-e2e-azure-csi-ultrassd
 - as: e2e-azure-file-csi
   steps:
     cluster_profile: openshift-org-azure

ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.22.yaml

@@ -304,6 +304,15 @@ tests:
   steps:
     cluster_profile: openshift-org-azure
     workflow: openshift-e2e-azure-manual-oidc-workload-identity
+- always_run: false
+  as: e2e-azure-csi-volumeattributesclass
+  optional: true
+  steps:
+    cluster_profile: openshift-org-azure
+    env:
+      TEST_ARGS: --run=VolumeAttributesClass
+      TEST_SUITE: all
+    workflow: openshift-e2e-azure-csi-ultrassd
 - as: e2e-azure-file-csi
   steps:
     cluster_profile: openshift-org-azure

ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-main-presubmits.yaml

@@ -1242,6 +1242,87 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-csi-hypershift,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build08
+    context: ci/prow/e2e-azure-csi-volumeattributesclass
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-csi-operator-main-e2e-azure-csi-volumeattributesclass
+    optional: true
+    rerun_command: /test e2e-azure-csi-volumeattributesclass
+    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-azure-csi-volumeattributesclass
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        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-azure-csi-volumeattributesclass,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.22-presubmits.yaml

@@ -5,7 +5,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-cross-account-operator-e2e
     decorate: true
     labels:
@@ -87,7 +87,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-operator-e2e
     decorate: true
     labels:
@@ -167,7 +167,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-operator-e2e-extended
     decorate: true
     labels:
@@ -249,7 +249,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-single-zone-cross-account-operator-e2e
     decorate: true
     labels:
@@ -330,7 +330,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-single-zone-operator-e2e
     decorate: true
     labels:
@@ -411,7 +411,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-single-zone-operator-e2e-extended
     decorate: true
     labels:
@@ -493,7 +493,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/aws-efs-sts-cross-account-operator-e2e
     decorate: true
     labels:
@@ -681,7 +681,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/e2e-aws-csi
     decorate: true
     labels:
@@ -761,7 +761,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/e2e-aws-csi-extended
     decorate: true
     labels:
@@ -843,7 +843,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/e2e-aws-ovn-upgrade
     decorate: true
     labels:
@@ -1242,6 +1242,87 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-azure-csi-hypershift,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^release-4\.22$
+    - ^release-4\.22-
+    cluster: build08
+    context: ci/prow/e2e-azure-csi-volumeattributesclass
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: azure4
+      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-azure
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-csi-operator-release-4.22-e2e-azure-csi-volumeattributesclass
+    optional: true
+    rerun_command: /test e2e-azure-csi-volumeattributesclass
+    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-azure-csi-volumeattributesclass
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        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-azure-csi-volumeattributesclass,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:
@@ -2060,7 +2141,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/e2e-openstack-manila-csi
     decorate: true
     labels:
@@ -2861,7 +2942,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/smb-win2019-operator-e2e
     decorate: true
     labels:
@@ -2943,7 +3024,7 @@ presubmits:
     branches:
     - ^release-4\.22$
     - ^release-4\.22-
-    cluster: build07
+    cluster: build06
     context: ci/prow/smb-win2022-operator-e2e
     decorate: true
     labels:

ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/OWNERS

@@ -0,0 +1,5 @@
+approvers:
+- storage-approvers
+
+reviewers:
+- storage-reviewers

ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.metadata.json

@@ -0,0 +1,11 @@
+{
+	"path": "openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"storage-approvers"
+		],
+		"reviewers": [
+			"storage-reviewers"
+		]
+	}
+}

ci-operator/step-registry/openshift/e2e/azure/csi/ultrassd/openshift-e2e-azure-csi-ultrassd-workflow.yaml

@@ -0,0 +1,32 @@
+workflow:
+  as: openshift-e2e-azure-csi-ultrassd
+  steps:
+    pre:
+    - chain: ipi-conf-azure
+    - ref: ipi-conf-azure-ultrassd
+    - ref: storage-conf-storageclass-pre-set-default-azure-disk-ultrassd
+    - chain: azure-provision-service-principal-minimal-permission
+    - ref: rhcos-conf-osstream
+    - chain: ipi-install
+    - ref: ipi-azure-rbac
+    - ref: storage-conf-csi-azure-disk
+    - ref: storage-conf-wait-for-csi-driver
+    - ref: storage-obj-save
+    test:
+    - ref: openshift-e2e-test
+    post:
+    - ref: storage-obj-check
+    - chain: gather-core-dump
+    - chain: ipi-azure-post
+    env:
+      AZURE_DISK_SKU: UltraSSD_LRS
+      CLUSTERCSIDRIVER: disk.csi.azure.com
+      TRUECONDITIONS: AzureDiskDriverControllerServiceControllerAvailable AzureDiskDriverNodeServiceControllerAvailable
+      TEST_CSI_DRIVER_MANIFEST: manifest-azure-disk.yaml
+      TEST_OCP_CSI_DRIVER_MANIFEST: ocp-manifest-azure-disk.yaml
+      TEST_SUITE: openshift/csi
+  documentation: |-
+    The Openshift E2E Azure CSI UltraSSD workflow executes the openshift/csi end-to-end test
+    suite on Azure Disk CSI driver with UltraSSD capability enabled and an UltraSSD_LRS
+    StorageClass set as default. This is required for VolumeAttributesClass tests which only
+    work with UltraSSD_LRS or PremiumV2_LRS disk types.