[DTK] Splitting the Dockerfile into 2 Dockerfiles.

This is required in order to support multi-stream in OCP.

Signed-off-by: Yoni Bettan <yonibettan@gmail.com>

Author: ybettan

ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml

@@ -6,8 +6,10 @@ base_images:
 build_root:
   from_repository: true
 images:
-- dockerfile_path: Dockerfile
-  to: driver-toolkit
+- dockerfile_path: Dockerfile.rhel9
+  to: driver-toolkit-rhel-9
+- dockerfile_path: Dockerfile.rhel10
+  to: driver-toolkit-rhel-10
 promotion:
   to:
   - additional_images:
@@ -41,13 +43,20 @@ tests:
   container:
     clone: true
     from: ocp_builder_rhel-9-golang-1.20-openshift-4.15
-- as: verify-image-content
+- as: verify-image-content-dtk-for-rhel-9
   commands: |
     ls /manifests/01-openshift-imagestream.yaml
     ls /manifests/image-references
     cat /etc/driver-toolkit-release.json
   container:
-    from: driver-toolkit
+    from: driver-toolkit-rhel-9
+- 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

ci-operator/jobs/openshift/driver-toolkit/openshift-driver-toolkit-master-presubmits.yaml

@@ -486,20 +486,20 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build10
-    context: ci/prow/verify-image-content
+    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
-    rerun_command: /test verify-image-content
+    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
+        - --target=verify-image-content-dtk-for-rhel-10
         command:
         - ci-operator
         env:
@@ -540,4 +540,57 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )verify-image-content,?($|\s.*)
+    trigger: (?m)^/test( | .* )verify-image-content-dtk-for-rhel-10,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build10
+    context: ci/prow/verify-image-content-dtk-for-rhel-9
+    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-9
+    rerun_command: /test verify-image-content-dtk-for-rhel-9
+    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-9
+        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( | .* )verify-image-content-dtk-for-rhel-9,?($|\s.*)