diff --git a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml deleted file mode 100644 index 9833d3e30b185..0000000000000 --- a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master.yaml +++ /dev/null @@ -1,78 +0,0 @@ -base_images: - ocp_4.18_base-rhel9: - name: "4.18" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 -binary_build_commands: go build cmd/manager/main.go -build_root: - from_repository: true -images: -- dockerfile_path: build/Dockerfile.openshift - 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: csi-driver-manila-operator -- dockerfile_path: Dockerfile.test - from: src - to: manila-csi-driver-operator-test -promotion: - to: - - name: "4.18" - namespace: ocp -releases: - initial: - integration: - name: "4.18" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.18" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: verify - commands: | - make verify - container: - from: src -- as: unit - commands: | - make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml - container: - from: src -- as: e2e-openstack-csi - steps: - cluster_profile: openstack-vh-mecha-central - workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack - optional: true - steps: - cluster_profile: openstack-vexxhost - workflow: openshift-e2e-openstack-ipi -- as: security - optional: true - steps: - workflow: openshift-ci-security -- as: verify-deps - steps: - test: - - ref: go-verify-deps -zz_generated_metadata: - branch: master - org: openshift - repo: csi-driver-manila-operator diff --git a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master__okd-scos.yaml b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master__okd-scos.yaml deleted file mode 100644 index d323e34359f27..0000000000000 --- a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master__okd-scos.yaml +++ /dev/null @@ -1,45 +0,0 @@ -base_images: - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 - origin_scos-4.18_base-stream9: - name: scos-4.18 - namespace: origin - tag: base-stream9 -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 -images: -- build_args: - - name: TAGS - value: scos - dockerfile_path: build/Dockerfile.openshift - 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: csi-driver-manila-operator -promotion: - to: - - name: scos-4.18 - namespace: origin -releases: - latest: - integration: - name: scos-4.18 - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: master - org: openshift - repo: csi-driver-manila-operator - variant: okd-scos diff --git a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18.yaml b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18.yaml deleted file mode 100644 index 2c804c82a22d8..0000000000000 --- a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18.yaml +++ /dev/null @@ -1,79 +0,0 @@ -base_images: - ocp_4.18_base-rhel9: - name: "4.18" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 -binary_build_commands: go build cmd/manager/main.go -build_root: - from_repository: true -images: -- dockerfile_path: build/Dockerfile.openshift - 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: csi-driver-manila-operator -- dockerfile_path: Dockerfile.test - from: src - to: manila-csi-driver-operator-test -promotion: - to: - - disabled: true - name: "4.18" - namespace: ocp -releases: - initial: - integration: - name: "4.18" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.18" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: verify - commands: | - make verify - container: - from: src -- as: unit - commands: | - make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml - container: - from: src -- as: e2e-openstack-csi - steps: - cluster_profile: openstack-vh-mecha-central - workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack - optional: true - steps: - cluster_profile: openstack-vexxhost - workflow: openshift-e2e-openstack-ipi -- as: security - optional: true - steps: - workflow: openshift-ci-security -- as: verify-deps - steps: - test: - - ref: go-verify-deps -zz_generated_metadata: - branch: release-4.18 - org: openshift - repo: csi-driver-manila-operator diff --git a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19.yaml b/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19.yaml deleted file mode 100644 index 578a7e09b0bde..0000000000000 --- a/ci-operator/config/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19.yaml +++ /dev/null @@ -1,78 +0,0 @@ -base_images: - ocp_4.18_base-rhel9: - name: "4.19" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 -binary_build_commands: go build cmd/manager/main.go -build_root: - from_repository: true -images: -- dockerfile_path: build/Dockerfile.openshift - 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: csi-driver-manila-operator -- dockerfile_path: Dockerfile.test - from: src - to: manila-csi-driver-operator-test -promotion: - to: - - name: "4.19" - namespace: ocp -releases: - initial: - integration: - name: "4.19" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.19" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: verify - commands: | - make verify - container: - from: src -- as: unit - commands: | - make test-unit JUNITFILE=${ARTIFACT_DIR}/junit_report.xml - container: - from: src -- as: e2e-openstack-csi - steps: - cluster_profile: openstack-vh-mecha-central - workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack - optional: true - steps: - cluster_profile: openstack-vexxhost - workflow: openshift-e2e-openstack-ipi -- as: security - optional: true - steps: - workflow: openshift-ci-security -- as: verify-deps - steps: - test: - - ref: go-verify-deps -zz_generated_metadata: - branch: release-4.19 - org: openshift - repo: csi-driver-manila-operator diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml index d0c7f23165db0..49b00316d93aa 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml @@ -133,6 +133,15 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: openstack-cinder-csi-driver-operator +- dockerfile_path: Dockerfile.openstack-manila + 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: csi-driver-manila-operator - dockerfile_path: Dockerfile.samba inputs: ocp_4.17_base-rhel9: @@ -163,6 +172,9 @@ images: - dockerfile_path: Dockerfile.test from: src to: smb-csi-driver-operator-test +- dockerfile_path: Dockerfile.test + from: src + to: manila-csi-driver-operator-test operator: bundles: - as: smb-csi-driver-operator-bundle @@ -308,7 +320,7 @@ tests: workflow: openshift-e2e-azure-csi-extended - as: e2e-openstack optional: true - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) steps: cluster_profile: openstack-vexxhost env: @@ -317,13 +329,18 @@ tests: 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/.*) + 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: e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + steps: + cluster_profile: openstack-vh-mecha-central + workflow: openshift-e2e-openstack-csi-manila - as: smb-operator-e2e optional: true steps: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master__okd-scos.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master__okd-scos.yaml index f44da56ad6efc..60929c40e5bcd 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master__okd-scos.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-master__okd-scos.yaml @@ -57,6 +57,17 @@ images: - builder - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: openstack-cinder-csi-driver-operator +- build_args: + - name: TAGS + value: scos + dockerfile_path: Dockerfile.openstack-manila + 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: csi-driver-manila-operator promotion: to: - name: scos-4.18 diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml index bd2d8cbe81075..ceb2c33dffcf2 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.18.yaml @@ -133,6 +133,15 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: openstack-cinder-csi-driver-operator +- dockerfile_path: Dockerfile.openstack-manila + 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: csi-driver-manila-operator - dockerfile_path: Dockerfile.samba inputs: ocp_4.17_base-rhel9: @@ -163,6 +172,9 @@ images: - dockerfile_path: Dockerfile.test from: src to: smb-csi-driver-operator-test +- dockerfile_path: Dockerfile.test + from: src + to: manila-csi-driver-operator-test operator: bundles: - as: smb-csi-driver-operator-bundle @@ -309,7 +321,7 @@ tests: workflow: openshift-e2e-azure-csi-extended - as: e2e-openstack optional: true - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) steps: cluster_profile: openstack-vexxhost env: @@ -318,13 +330,18 @@ tests: 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/.*) + 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: e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + steps: + cluster_profile: openstack-vh-mecha-central + workflow: openshift-e2e-openstack-csi-manila - as: smb-operator-e2e optional: true steps: diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml index 77a8ffac5e197..b90d207f8da93 100644 --- a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.19.yaml @@ -133,6 +133,15 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: openstack-cinder-csi-driver-operator +- dockerfile_path: Dockerfile.openstack-manila + 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: csi-driver-manila-operator - dockerfile_path: Dockerfile.samba inputs: ocp_4.17_base-rhel9: @@ -163,6 +172,9 @@ images: - dockerfile_path: Dockerfile.test from: src to: smb-csi-driver-operator-test +- dockerfile_path: Dockerfile.test + from: src + to: manila-csi-driver-operator-test operator: bundles: - as: smb-csi-driver-operator-bundle @@ -308,7 +320,7 @@ tests: workflow: openshift-e2e-azure-csi-extended - as: e2e-openstack optional: true - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) steps: cluster_profile: openstack-vexxhost env: @@ -317,13 +329,18 @@ tests: 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/.*) + 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: e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + steps: + cluster_profile: openstack-vh-mecha-central + workflow: openshift-e2e-openstack-csi-manila - as: smb-operator-e2e optional: true steps: diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-postsubmits.yaml deleted file mode 100644 index fb6851c6f92e1..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-postsubmits.yaml +++ /dev/null @@ -1,122 +0,0 @@ -postsubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: true - branches: - - ^master$ - cluster: build01 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-csi-driver-manila-operator-master-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^master$ - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: okd-scos - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-csi-driver-manila-operator-master-okd-scos-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=okd-scos - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml deleted file mode 100644 index 48522d43d8521..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-master-presubmits.yaml +++ /dev/null @@ -1,499 +0,0 @@ -presubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build10 - context: ci/prow/e2e-openstack - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-e2e-openstack - optional: true - rerun_command: /test e2e-openstack - 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 - - --secret-dir=/usr/local/e2e-openstack-cluster-profile - - --target=e2e-openstack - 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: /usr/local/e2e-openstack-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - 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-openstack,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/e2e-openstack-csi - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vh-mecha-central - ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-e2e-openstack-csi - 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=/secrets/ci-pull-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: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-csi-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vh-mecha-central - - 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-openstack-csi,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/images - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/okd-scos-images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: okd-scos - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-okd-scos-images - optional: true - rerun_command: /test okd-scos-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - - --variant=okd-scos - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )okd-scos-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/security - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-security - optional: true - rerun_command: /test security - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=security - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )security,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/unit - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-unit - rerun_command: /test unit - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=unit - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )unit,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/verify - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-verify - rerun_command: /test verify - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=verify - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/verify-deps - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-master-verify-deps - rerun_command: /test verify-deps - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=verify-deps - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify-deps,?($|\s.*) diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-postsubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-postsubmits.yaml deleted file mode 100644 index 4cd746929c0fd..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-postsubmits.yaml +++ /dev/null @@ -1,60 +0,0 @@ -postsubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - cluster: build09 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-csi-driver-manila-operator-release-4.18-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-presubmits.yaml deleted file mode 100644 index 81154a6b9dea0..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.18-presubmits.yaml +++ /dev/null @@ -1,439 +0,0 @@ -presubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: false - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build01 - context: ci/prow/e2e-openstack - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-e2e-openstack - optional: true - rerun_command: /test e2e-openstack - 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 - - --secret-dir=/usr/local/e2e-openstack-cluster-profile - - --target=e2e-openstack - 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: /usr/local/e2e-openstack-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - 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-openstack,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/e2e-openstack-csi - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vh-mecha-central - ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-e2e-openstack-csi - 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=/secrets/ci-pull-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: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-csi-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vh-mecha-central - - 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-openstack-csi,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/images - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/security - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-security - optional: true - rerun_command: /test security - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=security - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )security,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/unit - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-unit - rerun_command: /test unit - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=unit - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )unit,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/verify - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-verify - rerun_command: /test verify - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=verify - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.18$ - - ^release-4\.18- - cluster: build05 - context: ci/prow/verify-deps - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.18-verify-deps - rerun_command: /test verify-deps - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=verify-deps - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify-deps,?($|\s.*) diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-postsubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-postsubmits.yaml deleted file mode 100644 index cfe9b49f0018d..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-postsubmits.yaml +++ /dev/null @@ -1,60 +0,0 @@ -postsubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - cluster: build09 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-csi-driver-manila-operator-release-4.19-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-presubmits.yaml deleted file mode 100644 index eb61ac1baf736..0000000000000 --- a/ci-operator/jobs/openshift/csi-driver-manila-operator/openshift-csi-driver-manila-operator-release-4.19-presubmits.yaml +++ /dev/null @@ -1,440 +0,0 @@ -presubmits: - openshift/csi-driver-manila-operator: - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build01 - context: ci/prow/e2e-openstack - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-e2e-openstack - optional: true - rerun_command: /test e2e-openstack - 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 - - --secret-dir=/usr/local/e2e-openstack-cluster-profile - - --target=e2e-openstack - 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: /usr/local/e2e-openstack-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - 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-openstack,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/e2e-openstack-csi - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vh-mecha-central - ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-e2e-openstack-csi - 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=/secrets/ci-pull-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: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-csi-cluster-profile - name: cluster-profile - - 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: cluster-profile - secret: - secretName: cluster-secrets-openstack-vh-mecha-central - - 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-openstack-csi,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/images - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/security - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-security - optional: true - rerun_command: /test security - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=security - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )security,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/unit - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-unit - rerun_command: /test unit - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=unit - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )unit,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/verify - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-verify - rerun_command: /test verify - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=verify - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build05 - context: ci/prow/verify-deps - decorate: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-csi-driver-manila-operator-release-4.19-verify-deps - rerun_command: /test verify-deps - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=verify-deps - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )verify-deps,?($|\s.*) diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml index 31c5d5ece60b7..c99170c37c63b 100644 --- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-master-presubmits.yaml @@ -1222,7 +1222,7 @@ presubmits: name: pull-ci-openshift-csi-operator-master-e2e-openstack optional: true rerun_command: /test e2e-openstack - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) spec: containers: - args: @@ -1301,7 +1301,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-csi-operator-master-e2e-openstack-cinder-csi rerun_command: /test e2e-openstack-cinder-csi - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*) spec: containers: - args: @@ -1365,6 +1365,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-cinder-csi,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build01 + context: ci/prow/e2e-openstack-manila-csi + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vh-mecha-central + ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-csi-operator-master-e2e-openstack-manila-csi + rerun_command: /test e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + 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 + - --secret-dir=/usr/local/e2e-openstack-manila-csi-cluster-profile + - --target=e2e-openstack-manila-csi + 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: /usr/local/e2e-openstack-manila-csi-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vh-mecha-central + - 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-openstack-manila-csi,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml index bae1eb37ea29a..2a215d7b2d7b1 100644 --- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.18-presubmits.yaml @@ -1222,7 +1222,7 @@ presubmits: name: pull-ci-openshift-csi-operator-release-4.18-e2e-openstack optional: true rerun_command: /test e2e-openstack - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) spec: containers: - args: @@ -1301,7 +1301,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-csi-operator-release-4.18-e2e-openstack-cinder-csi rerun_command: /test e2e-openstack-cinder-csi - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*) spec: containers: - args: @@ -1365,6 +1365,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-cinder-csi,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.18$ + - ^release-4\.18- + cluster: build05 + context: ci/prow/e2e-openstack-manila-csi + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vh-mecha-central + ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-csi-operator-release-4.18-e2e-openstack-manila-csi + rerun_command: /test e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + 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 + - --secret-dir=/usr/local/e2e-openstack-manila-csi-cluster-profile + - --target=e2e-openstack-manila-csi + 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: /usr/local/e2e-openstack-manila-csi-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vh-mecha-central + - 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-openstack-manila-csi,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml index d4deb1b64b4bf..4645c195aa8d1 100644 --- a/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/csi-operator/openshift-csi-operator-release-4.19-presubmits.yaml @@ -1222,7 +1222,7 @@ presubmits: name: pull-ci-openshift-csi-operator-release-4.19-e2e-openstack optional: true rerun_command: /test e2e-openstack - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*|Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) spec: containers: - args: @@ -1301,7 +1301,7 @@ presubmits: pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-csi-operator-release-4.19-e2e-openstack-cinder-csi rerun_command: /test e2e-openstack-cinder-csi - run_if_changed: ^(Dockerfile\.openstack-cinder|legacy/openstack-cinder-csi-driver-operator/.*) + run_if_changed: ^(Dockerfile\.openstack-cinder|legacy\/openstack-cinder-csi-driver-operator\/.*) spec: containers: - args: @@ -1365,6 +1365,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-cinder-csi,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.19$ + - ^release-4\.19- + cluster: build05 + context: ci/prow/e2e-openstack-manila-csi + decorate: true + labels: + ci-operator.openshift.io/cloud: openstack-vh-mecha-central + ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-csi-operator-release-4.19-e2e-openstack-manila-csi + rerun_command: /test e2e-openstack-manila-csi + run_if_changed: ^(Dockerfile\.openstack-manila|legacy\/csi-driver-manila-operator\/.*) + 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 + - --secret-dir=/usr/local/e2e-openstack-manila-csi-cluster-profile + - --target=e2e-openstack-manila-csi + 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: /usr/local/e2e-openstack-manila-csi-cluster-profile + name: cluster-profile + - 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: cluster-profile + secret: + secretName: cluster-secrets-openstack-vh-mecha-central + - 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-openstack-manila-csi,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh index fec2f93bc4583..1459621ab7f8f 100644 --- a/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh +++ b/ci-operator/step-registry/storage/conf/csi-openstack-manila/storage-conf-csi-openstack-manila-commands.sh @@ -3,8 +3,15 @@ set -o errexit set -o nounset set -o pipefail -cd /go/src/github.com/openshift/csi-driver-manila-operator -cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST} +if [ -d /go/src/github.com/openshift/csi-operator/legacy/ ]; then + echo "Using legacy csi directory" + cd /go/src/github.com/openshift/csi-operator/legacy/csi-driver-manila-operator + cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST} +else + echo "Using regular csi directory" + cd /go/src/github.com/openshift/csi-driver-manila-operator + cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST} +fi # For debugging echo "Using ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}:"