From f93be93d81279111514c816023a4fe18635a6491 Mon Sep 17 00:00:00 2001 From: Malay Kumar Parida Date: Mon, 16 Mar 2026 17:12:11 +0530 Subject: [PATCH] Add ocs-operator ci config for 4.22 Signed-off-by: Malay Kumar Parida --- .../red-hat-storage-ocs-operator-main.yaml | 8 +- ...hat-storage-ocs-operator-release-4.22.yaml | 64 ++++++ ...-ocs-operator-release-4.22-presubmits.yaml | 194 ++++++++++++++++++ 3 files changed, 262 insertions(+), 4 deletions(-) create mode 100644 ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22.yaml create mode 100644 ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22-presubmits.yaml diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml index da84b5714730e..3e67c4846c6a9 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml @@ -2,16 +2,16 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.21 + tag: rhel-9-release-golang-1.25-openshift-4.22 images: - build_args: - name: LDFLAGS - value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.21.0 + value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.22.0 dockerfile_path: Dockerfile to: ocs-operator - build_args: - name: LDFLAGS - value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.21.0 + value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.22.0 dockerfile_path: metrics/Dockerfile to: ocs-metrics-exporter operator: @@ -27,7 +27,7 @@ operator: releases: latest: integration: - name: "4.21" + name: "4.22" namespace: ocp resources: '*': diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22.yaml new file mode 100644 index 0000000000000..409620ba46f42 --- /dev/null +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22.yaml @@ -0,0 +1,64 @@ +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.25-openshift-4.22 +images: +- build_args: + - name: LDFLAGS + value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.22.0 + dockerfile_path: Dockerfile + to: ocs-operator +- build_args: + - name: LDFLAGS + value: -X github.com/red-hat-storage/ocs-operator/v4/version.Version=4.22.0 + context_dir: metrics + dockerfile_path: Dockerfile + to: ocs-metrics-exporter +operator: + bundles: + - as: ocs-operator-bundle + dockerfile_path: Dockerfile.bundle + skip_building_index: true + substitutions: + - pullspec: quay.io/ocs-dev/ocs-operator:latest + with: pipeline:ocs-operator + - pullspec: quay.io/ocs-dev/ocs-metrics-exporter:latest + with: pipeline:ocs-metrics-exporter +releases: + latest: + integration: + name: "4.22" + namespace: ocp +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: ocs-operator-bundle-e2e-aws + steps: + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge + ZONES_COUNT: "3" + test: + - as: e2e-test + cli: latest + commands: | + export BUNDLE_FULL_IMAGE_NAME="$OO_BUNDLE"; make install + export GOFLAGS=''; make functest + dependencies: + - env: OO_BUNDLE + name: ocs-operator-bundle + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: ipi-aws +zz_generated_metadata: + branch: release-4.22 + org: red-hat-storage + repo: ocs-operator diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22-presubmits.yaml new file mode 100644 index 0000000000000..628c8b4be8506 --- /dev/null +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.22-presubmits.yaml @@ -0,0 +1,194 @@ +presubmits: + red-hat-storage/ocs-operator: + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build01 + context: ci/prow/ci-bundle-ocs-operator-bundle + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-red-hat-storage-ocs-operator-release-4.22-ci-bundle-ocs-operator-bundle + rerun_command: /test ci-bundle-ocs-operator-bundle + 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=ocs-operator-bundle + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_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( | .* )ci-bundle-ocs-operator-bundle,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-red-hat-storage-ocs-operator-release-4.22-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: quay-proxy.ci.openshift.org/openshift/ci:ci_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\.22$ + - ^release-4\.22- + cluster: build03 + context: ci/prow/ocs-operator-bundle-e2e-aws + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-red-hat-storage-ocs-operator-release-4.22-ocs-operator-bundle-e2e-aws + rerun_command: /test ocs-operator-bundle-e2e-aws + 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=ocs-operator-bundle-e2e-aws + 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( | .* )ocs-operator-bundle-e2e-aws,?($|\s.*)