CORS-3462: extract static openshift-installer from 4.16 (#1653)

* Refactor calculation of default installer cmd for extraction

Dynamically determine the installer command to extract from the payload.
After extraction, rename it to "openshift-install" so that we always
have a consistent command name, regardless of what was extracted or if
we built it locally.

* Switch from openshift-baremetal-install to openshift-install from 4.16

This allows us to continue to run on RHEL/CentOS 8.
openshift-baremetal-install will be dynamically linked for RHEL 9
starting with 4.16.

* Use FIPS-capable installer when requested

Only do this if FIPS_VALIDATE is set to true, otherwise this will break
the ability to test FIPS on RHEL/CentOS 8 with OCP 4.16 and later.

Author: zaneb

03_build_installer.sh

@@ -20,7 +20,11 @@ function build_installer() {
   # Build installer
   pushd .
   cd $OPENSHIFT_INSTALL_PATH
-  TAGS="${OPENSHIFT_INSTALLER_BUILD_TAGS:-libvirt baremetal}" DEFAULT_ARCH=$(get_arch) hack/build.sh
+  local default_tags="libvirt baremetal"
+  if [[ "${FIPS_MODE:-false}" = "true" && "${FIPS_VALIDATE:-false}" = "true" ]]; then
+      default_tags="${default_tags} fipscapable"
+  fi
+  TAGS="${OPENSHIFT_INSTALLER_BUILD_TAGS:-${default_tags}}" DEFAULT_ARCH=$(get_arch) hack/build.sh
   popd
   # This is only needed in rhcos.sh for old versions which lack the
   # openshift-install coreos-print-stream-json option
@@ -33,13 +37,18 @@ function build_installer() {
 }
 
 function extract_installer() {
-    local release_image
-    local outdir
+    local release_image="$1"
+    local outdir="$2"
+    local cmd
+
+    cmd="${OPENSHIFT_INSTALLER_CMD:-$(default_installer_cmd)}"
 
-    release_image="$1"
-    outdir="$2"
+    extract_command "${cmd}" "${release_image}" "${outdir}"
 
-    extract_command "${OPENSHIFT_INSTALLER_CMD:-openshift-baremetal-install}" "$1" "$2"
+    local target="openshift-install"
+    if [ "${cmd}" != "${target}" ]; then
+        mv "${outdir}/${cmd}" "${outdir}/${target}"
+    fi
 }
 
 early_deploy_validation

common.sh

@@ -206,7 +206,7 @@ if [ "${UPSTREAM_IRONIC:-false}" != "false" ] ; then
 fi
 
 if [ -z "$KNI_INSTALL_FROM_GIT" ]; then
-    export OPENSHIFT_INSTALLER=${OPENSHIFT_INSTALLER:-${OCP_DIR}/openshift-baremetal-install}
+    export OPENSHIFT_INSTALLER=${OPENSHIFT_INSTALLER:-${OCP_DIR}/openshift-install}
  else
     export OPENSHIFT_INSTALLER=${OPENSHIFT_INSTALLER:-$OPENSHIFT_INSTALL_PATH/bin/openshift-install}
 

utils.sh

@@ -4,6 +4,14 @@ set -o pipefail
 
 source release_info.sh
 
+function default_installer_cmd() {
+    if is_lower_version "$(openshift_version "${OCP_DIR}")" "4.16" || [[ "${FIPS_MODE:-false}" = "true" && "${FIPS_VALIDATE:-false}" = "true" ]]; then
+        printf "openshift-baremetal-install"
+    else
+        printf "openshift-install"
+    fi
+}
+
 function retry_with_timeout() {
   retries=$1
   timeout_duration=$2
@@ -458,7 +466,7 @@ function setup_legacy_release_mirror {
     #To ensure that you use the correct images for the version of OpenShift Container Platform that you selected,
     #you must extract the installation program from the mirrored content:
     if [ -z "$KNI_INSTALL_FROM_GIT" ]; then
-      local installer="${OPENSHIFT_INSTALLER_CMD:-openshift-baremetal-install}"
+      local installer="${OPENSHIFT_INSTALLER_CMD:-$(default_installer_cmd)}"
 
       EXTRACT_DIR=$(mktemp --tmpdir -d "mirror-installer--XXXXXXXXXX")
       _tmpfiles="$_tmpfiles $EXTRACT_DIR"