From 96299a7b8b2e06370717c521d6eb33975f18771f Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Fri, 8 May 2026 14:03:56 +0300 Subject: [PATCH] ocp-virt-validation-checkup: add 4.22 jobs Signed-off-by: Oren Cohen --- ...rt-validation-checkup-main__periodics.yaml | 2 +- ...-virt-validation-checkup-release-4.22.yaml | 54 +++++ ...ation-checkup-release-4.22__periodics.yaml | 105 +++++++++ ...dation-checkup-release-4.22-periodics.yaml | 84 +++++++ ...ation-checkup-release-4.22-presubmits.yaml | 205 ++++++++++++++++++ 5 files changed, 449 insertions(+), 1 deletion(-) create mode 100644 ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22.yaml create mode 100644 ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22__periodics.yaml create mode 100644 ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-periodics.yaml create mode 100644 ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-presubmits.yaml diff --git a/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml index 1f4029a888e43..e6b3e23d75217 100644 --- a/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml +++ b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-main__periodics.yaml @@ -24,7 +24,7 @@ tests: BASE_DOMAIN: cnv-devel.azure.devcluster.openshift.com COMPUTE_NODE_TYPE: Standard_D4s_v5 ODF_BACKEND_STORAGE_CLASS: managed-csi - ODF_OPERATOR_CHANNEL: stable-4.20 + ODF_OPERATOR_CHANNEL: stable-4.21 observers: enable: - observers-resource-watch diff --git a/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22.yaml b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22.yaml new file mode 100644 index 0000000000000..f26d17810a7f8 --- /dev/null +++ b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22.yaml @@ -0,0 +1,54 @@ +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.24-openshift-4.22 +images: + items: + - dockerfile_path: ci/Dockerfile.ci + to: ocp-virt-validation-checkup +releases: + latest: + candidate: + product: ocp + stream: nightly + version: "4.22" +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 600Mi +tests: +- as: unit + commands: make test + container: + from: src +- as: e2e-aws + steps: + cluster_profile: aws-virtualization + env: + BASE_DOMAIN: cnv-ci.syseng.devcluster.openshift.com + CNV_VERSION: "4.22" + test: + - ref: interop-tests-deploy-cnv + - as: run-validation-checkup + cli: latest + commands: make ci-validate + dependencies: + - env: OCP_VIRT_VALIDATION_IMAGE + name: ocp-virt-validation-checkup + env: + - default: gp3 + name: STORAGE_CLASS + from: src + resources: + requests: + cpu: 100m + memory: 600Mi + workflow: cnv-e2e-ipi-aws +zz_generated_metadata: + branch: release-4.22 + org: openshift-cnv + repo: ocp-virt-validation-checkup diff --git a/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22__periodics.yaml b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22__periodics.yaml new file mode 100644 index 0000000000000..6a57cf3ac5c99 --- /dev/null +++ b/ci-operator/config/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22__periodics.yaml @@ -0,0 +1,105 @@ +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.24-openshift-4.22 +releases: + latest: + release: + channel: candidate + version: "4.22" +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 600Mi +tests: +- as: e2e-azure + cron: 0 20 * * 0 + steps: + cluster_profile: azure-virtualization + env: + BASE_DOMAIN: cnv-devel.azure.devcluster.openshift.com + COMPUTE_NODE_TYPE: Standard_D4s_v5 + ODF_BACKEND_STORAGE_CLASS: managed-csi + ODF_OPERATOR_CHANNEL: stable-4.21 + observers: + enable: + - observers-resource-watch + test: + - as: install-cnv + cli: latest + commands: | + curl -L https://github.com/openshift-cnv/cnv-ci/tarball/master -o /tmp/cnv-ci.tgz + mkdir -p /tmp/cnv-ci + tar -xvzf /tmp/cnv-ci.tgz -C /tmp/cnv-ci --strip-components=1 + cd /tmp/cnv-ci + make update_pull_secret set_imagedigestmirrorset deploy_cnv + oc patch hco kubevirt-hyperconverged -n openshift-cnv --type=json -p='[{"op": "add", "path": "/spec/defaultCPUModel", "value": "Broadwell"}]' + credentials: + - mount_path: /var/run/cnv-ci-brew-pull-secret + name: cnv-ci-brew-pull-secret + namespace: test-credentials + - mount_path: /var/run/cnv-ci-konflux-pull-secret + name: konflux-pull-secret + namespace: test-credentials + env: + - default: '|7820aea2-0d75-11e7-9259-28d244ea5a6d.hhav.f63e13' + name: BREW_IMAGE_REGISTRY_USERNAME + - default: /var/run/cnv-ci-brew-pull-secret/token + name: BREW_IMAGE_REGISTRY_TOKEN_PATH + - default: openshift-virtualization+konflux_ro_bot + name: KONFLUX_REGISTRY_USERNAME + - default: /var/run/cnv-ci-konflux-pull-secret/token + name: KONFLUX_REGISTRY_TOKEN_PATH + - default: "4.22" + name: OCP_VERSION + - default: "4.22" + name: CNV_VERSION + - default: /tmp/artifacts + name: ARTIFACTS_DIR + - default: openshift-cnv + name: TARGET_NAMESPACE + - default: "false" + name: PRODUCTION_RELEASE + from: src + resources: + requests: + cpu: 100m + memory: 600Mi + timeout: 1h0m0s + - ref: hypershift-kubevirt-install-odf + - as: run-validation-checkup + cli: latest + commands: | + export CSV_NAME=$(oc get csv -n openshift-cnv -o json | jq -r '.items[] | select(.metadata.name | startswith("kubevirt-hyperconverged")).metadata.name') + export OCP_VIRT_VALIDATION_IMAGE=$(oc get csv -n ${TARGET_NAMESPACE} $CSV_NAME -o json | jq -r '.spec.relatedImages[] | select(.name | contains("ocp-virt-validation-checkup")).image') + make ci-validate || true # Once https://issues.redhat.com/browse/CNV-71660 is fixed, remove "|| true" + env: + - default: "false" + name: DRY_RUN + - default: 360m + name: OCP_VIRT_VALIDATION_TIMEOUT + - default: ocs-storagecluster-ceph-rbd-virtualization + name: STORAGE_CLASS + - default: test_id:1780|test_id:1783|test_id:1513|test_id:1514 + name: TEST_SKIPS + - default: openshift-cnv + name: TARGET_NAMESPACE + - default: /tmp/artifacts + name: ARTIFACTS_DIR + from: src + resources: + requests: + cpu: 100m + memory: 600Mi + timeout: 6h30m0s + workflow: ipi-azure + timeout: 9h0m0s +zz_generated_metadata: + branch: release-4.22 + org: openshift-cnv + repo: ocp-virt-validation-checkup + variant: periodics diff --git a/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-periodics.yaml b/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-periodics.yaml new file mode 100644 index 0000000000000..3d937304c779e --- /dev/null +++ b/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-periodics.yaml @@ -0,0 +1,84 @@ +periodics: +- agent: kubernetes + cluster: build01 + cron: 0 20 * * 0 + decorate: true + decoration_config: + skip_cloning: true + timeout: 9h0m0s + extra_refs: + - base_ref: release-4.22 + org: openshift-cnv + repo: ocp-virt-validation-checkup + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-virtualization + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-cnv-ocp-virt-validation-checkup-release-4.22-periodics-e2e-azure + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-azure + - --variant=periodics + 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 diff --git a/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-presubmits.yaml new file mode 100644 index 0000000000000..70d4a66bcd6cb --- /dev/null +++ b/ci-operator/jobs/openshift-cnv/ocp-virt-validation-checkup/openshift-cnv-ocp-virt-validation-checkup-release-4.22-presubmits.yaml @@ -0,0 +1,205 @@ +presubmits: + openshift-cnv/ocp-virt-validation-checkup: + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build10 + context: ci/prow/e2e-aws + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-virtualization + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cnv-ocp-virt-validation-checkup-release-4.22-e2e-aws + rerun_command: /test 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=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( | .* )e2e-aws,?($|\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 + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cnv-ocp-virt-validation-checkup-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: build01 + context: ci/prow/unit + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cnv-ocp-virt-validation-checkup-release-4.22-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 + 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: /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.*)