Merge pull request kubernetes-sigs#52 from bertinatto/art-consistency-openshift-4.15-ose-gcp-pd-csi-driver

OCPBUGS-24084: Move builder and base image to RHEL 9

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.15
+  tag: rhel-9-release-golang-1.20-openshift-4.15

Dockerfile.openshift

@@ -1,15 +1,15 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver
 COPY . .
 # Skip Windows driver build
 RUN make gce-pd-driver
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 
 # Get all deps
 # nvme-cli and /usr/bin/xxd are deps of google_nvme_id
 RUN yum update -y && \
-    yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux systemd-udev nvme-cli /usr/bin/xxd && \
+    yum install --setopt=tsflags=nodocs -y e2fsprogs xfsprogs util-linux nvme-cli /usr/lib/udev/scsi_id /usr/bin/xxd && \
     yum clean all && rm -rf /var/cache/yum/* && \
     mkdir -p /lib/udev_containerized && cp /usr/lib/udev/scsi_id /lib/udev_containerized/scsi_id # The driver assumes this path