From 1afc13d94e0c09aac210513ea0a66d92be0943e6 Mon Sep 17 00:00:00 2001 From: Yoni Bettan Date: Wed, 18 Feb 2026 11:20:02 +0200 Subject: [PATCH] [DTK] Splitting the Dockerfile into 2 Dockerfiles. This is required in order to support multi-stream in OCP. Signed-off-by: Yoni Bettan --- .../openshift-driver-toolkit-master.yaml | 9 +++ ...hift-driver-toolkit-master-presubmits.yaml | 61 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml index 08395f6a01ed1..72c05c8bd7343 100644 --- a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml +++ b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml @@ -8,6 +8,8 @@ build_root: images: - dockerfile_path: Dockerfile to: driver-toolkit +- dockerfile_path: Dockerfile.rhel10 + to: driver-toolkit-rhel-10 promotion: to: - additional_images: @@ -48,6 +50,13 @@ tests: cat /etc/driver-toolkit-release.json container: from: driver-toolkit +- as: verify-image-content-dtk-for-rhel-10 + commands: | + ls /manifests/01-openshift-imagestream.yaml + ls /manifests/image-references + cat /etc/driver-toolkit-release.json + container: + from: driver-toolkit-rhel-10 - as: e2e-aws steps: cluster_profile: aws diff --git a/ci-operator/jobs/openshift/driver-toolkit/openshift-driver-toolkit-master-presubmits.yaml b/ci-operator/jobs/openshift/driver-toolkit/openshift-driver-toolkit-master-presubmits.yaml index 667458cf0a1aa..5289ee1b8b643 100644 --- a/ci-operator/jobs/openshift/driver-toolkit/openshift-driver-toolkit-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/driver-toolkit/openshift-driver-toolkit-master-presubmits.yaml @@ -541,3 +541,64 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )verify-image-content,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build10 + context: ci/prow/verify-image-content-dtk-for-rhel-10 + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-driver-toolkit-master-verify-image-content-dtk-for-rhel-10 + rerun_command: /test verify-image-content-dtk-for-rhel-10 + 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-image-content-dtk-for-rhel-10 + 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( | .* )verify-image-content-dtk-for-rhel-10,?($|\s.*)