Extend CSI driver testing for Manila & Cinder

ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml

@@ -87,6 +87,10 @@ tests:
   steps:
     cluster_profile: openstack
     workflow: openshift-e2e-openstack-csi-cinder
+- as: e2e-openstack-csi-manila
+  steps:
+    cluster_profile: openstack-vh-mecha
+    workflow: openshift-e2e-openstack-csi-manila
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9.yaml

@@ -88,6 +88,10 @@ tests:
   steps:
     cluster_profile: openstack
     workflow: openshift-e2e-openstack-csi-cinder
+- as: e2e-openstack-csi-manila
+  steps:
+    cluster_profile: openstack-vh-mecha
+    workflow: openshift-e2e-openstack-csi-manila
 zz_generated_metadata:
   branch: release-4.9
   org: openshift

ci-operator/config/openshift/csi-driver-nfs/openshift-csi-driver-nfs-master.yaml

@@ -43,6 +43,10 @@ tests:
   commands: make test-vendor
   container:
     from: src
+- as: e2e-openstack-csi
+  steps:
+    cluster_profile: openstack-vh-mecha
+    workflow: openshift-e2e-openstack-csi-manila
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/csi-driver-nfs/openshift-csi-driver-nfs-release-4.9.yaml

@@ -44,6 +44,10 @@ tests:
   commands: make test-vendor
   container:
     from: src
+- as: e2e-openstack-csi
+  steps:
+    cluster_profile: openstack-vh-mecha
+    workflow: openshift-e2e-openstack-csi-manila
 zz_generated_metadata:
   branch: release-4.9
   org: openshift

ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master-presubmits.yaml

@@ -66,7 +66,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - master
     cluster: build01
@@ -79,6 +79,7 @@ presubmits:
     optional: true
     path_alias: k8s.io/cloud-provider-openstack
     rerun_command: /test e2e-openstack-csi-cinder
+    run_if_changed: ^pkg/csi/cinder/
     spec:
       containers:
       - args:
@@ -131,6 +132,73 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack-csi-cinder,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    cluster: build01
+    context: ci/prow/e2e-openstack-csi-manila
+    decorate: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-openstack-master-e2e-openstack-csi-manila
+    optional: true
+    path_alias: k8s.io/cloud-provider-openstack
+    rerun_command: /test e2e-openstack-csi-manila
+    run_if_changed: ^pkg/csi/manila/
+    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=/usr/local/e2e-openstack-csi-manila-cluster-profile
+        - --target=e2e-openstack-csi-manila
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-csi-manila-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          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: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack-vh-mecha
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-csi-manila,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.9-presubmits.yaml

@@ -66,7 +66,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - release-4.9
     cluster: build01
@@ -78,6 +78,7 @@ presubmits:
     name: pull-ci-openshift-cloud-provider-openstack-release-4.9-e2e-openstack-csi-cinder
     path_alias: k8s.io/cloud-provider-openstack
     rerun_command: /test e2e-openstack-csi-cinder
+    run_if_changed: ^pkg/csi/cinder/
     spec:
       containers:
       - args:
@@ -130,6 +131,73 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-openstack-csi-cinder,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - release-4.9
+    cluster: build01
+    context: ci/prow/e2e-openstack-csi-manila
+    decorate: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cloud-provider-openstack-release-4.9-e2e-openstack-csi-manila
+    optional: true
+    path_alias: k8s.io/cloud-provider-openstack
+    rerun_command: /test e2e-openstack-csi-manila
+    run_if_changed: ^pkg/csi/manila/
+    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=/usr/local/e2e-openstack-csi-manila-cluster-profile
+        - --target=e2e-openstack-csi-manila
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-csi-manila-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          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: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack-vh-mecha
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-csi-manila,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

ci-operator/jobs/openshift/csi-driver-nfs/openshift-csi-driver-nfs-master-presubmits.yaml

@@ -1,5 +1,71 @@
 presubmits:
   openshift/csi-driver-nfs:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/e2e-openstack-csi
+    decorate: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-csi-driver-nfs-master-e2e-openstack-csi
+    optional: true
+    path_alias: github.com/kubernetes-csi/csi-driver-nfs
+    rerun_command: /test e2e-openstack-csi
+    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=/usr/local/e2e-openstack-csi-cluster-profile
+        - --target=e2e-openstack-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          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: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack-vh-mecha
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

ci-operator/jobs/openshift/csi-driver-nfs/openshift-csi-driver-nfs-release-4.9-presubmits.yaml

@@ -1,5 +1,71 @@
 presubmits:
   openshift/csi-driver-nfs:
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - release-4.9
+    cluster: build02
+    context: ci/prow/e2e-openstack-csi
+    decorate: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-csi-driver-nfs-release-4.9-e2e-openstack-csi
+    optional: true
+    path_alias: github.com/kubernetes-csi/csi-driver-nfs
+    rerun_command: /test e2e-openstack-csi
+    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=/usr/local/e2e-openstack-csi-cluster-profile
+        - --target=e2e-openstack-csi
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /usr/local/e2e-openstack-csi-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          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: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-openstack-vh-mecha
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-openstack-csi,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: