From cf898381fe5d04e97ab758d8c91adde5308e007c Mon Sep 17 00:00:00 2001
From: Gregory Giguashvili <ggiguash@redhat.com>
Date: Tue, 7 Feb 2023 07:10:52 +0000
Subject: [PATCH] Delete microshift RPM files from rhocp repo when building ISO
 images

---
 scripts/image-builder/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/image-builder/build.sh b/scripts/image-builder/build.sh
index 5275ceadee..9edcec7e69 100755
--- a/scripts/image-builder/build.sh
+++ b/scripts/image-builder/build.sh
@@ -245,8 +245,10 @@ reposync -n -a ${BUILD_ARCH} -a noarch --download-path openshift-local \
     --repo=${OCP_REPO_NAME} \
     --repo=fast-datapath-for-rhel-8-${BUILD_ARCH}-rpms >/dev/null
 
-# Remove coreos packages to avoid conflicts
+# Remove 'coreos' packages to avoid conflicts
 find openshift-local -name \*coreos\* -exec rm -f {} \;
+# Remove 'microshift' packages to avoid overrides from the remote repository
+find openshift-local -name \*microshift\* -exec rm -f {} \;
 # Exit if no RPM packages were found
 if [ $(find openshift-local -name '*.rpm' | wc -l) -eq 0 ] ; then
     echo "No RPM packages were found at the '${OCP_REPO_NAME}' repository. Exiting..."