Merge pull request #4615 from eslutsky/add-skipped-optional-rpms-option

USHIFT-5456: add optional-skipped-rpms option to configure-vm

Author: openshift-merge-bot[bot]

scripts/devenv-builder/configure-vm.sh

@@ -28,6 +28,7 @@ function usage() {
     echo "  --skip-dnf-update         Do NOT run dnf update"
     echo "  --pull-images             Force pulling of container images before starting MicroShift"
     echo "  --optional-rpms           Install optional RPMs (OLM, Multus) along with core MicroShift RPMs"
+    echo "  --skip-optional-rpms      Comma separated list of optional RPMs to skip."
 
     [ -n "$1" ] && echo -e "\nERROR: $1"
     exit 1
@@ -64,6 +65,10 @@ while [ $# -gt 1 ]; do
         OPTIONAL_RPMS=true
         shift
         ;;
+    --skip-optional-rpms)
+        OPTIONAL_SKIPPED_RPMS=$2
+        shift 2
+        ;;        
     *) usage ;;
     esac
 done
@@ -258,7 +263,13 @@ if ${BUILD_AND_RUN}; then
         # Skip gateway api rpms because:
         # - Feature is still dev preview and no tests/docs are guaranteed.
         # - There is one issue with conformance (see USHIFT-4757) that needs to be addressed in the operator.
-        SKIPPED_RPMS="gateway-api ai-model-serving low-latency"
+
+        if [ -n "${OPTIONAL_SKIPPED_RPMS}" ] ; then
+            SKIPPED_RPMS="gateway-api ${OPTIONAL_SKIPPED_RPMS//,/ }"
+        else
+            SKIPPED_RPMS="gateway-api"
+        fi
+        
         # shellcheck disable=SC2046,SC2086
         "${DNF_RETRY}" "localinstall" "$(find ~/microshift/_output/rpmbuild/RPMS -type f -name "*.rpm" $(printf ' -not -name *%s* ' ${SKIPPED_RPMS}))" 
     else