AGENT-1134: Dev-scripts support to build OVE ISO

- Builds agent ISO without registry.
- Sets rendezvousIP automatically through TUI.
- Verifies UI is running and accesible.

To test, set as below

export AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
export AGENT_E2E_TEST_SCENARIO=SNO_IPV4

make agent_iso_no_registry

ISO will be created at
ocp/ostest/iso_builder/<OCP_VERSION>/ove/output/agent-ove.x86_64.iso

Author: pawanpinjarkar

Makefile

@@ -13,6 +13,12 @@ agent: agent_requirements requirements configure agent_build_installer agent_pre
 # Requires at least 1 extra worker node to be configured with disk size at least 100Gß
 agent_plus_add_node: agent agent_add_extraworker_nodes
 
+# Create an agent (OVE) ISO that includes agent-tui, assisted-install-ui, and release images,
+# enabling cluster installation in disconnected environments without requiring a registry.
+# TODO: Enhance agent_create_cluster to programmatically interact with the UI to initiate cluster installation.
+# Currently, agent_create_cluster boots the agent OVE ISO, configures the rendezvousIP and verifies if UI is running.
+agent_iso_no_registry: agent_requirements requirements configure agent_clone_agent_installer_utils agent_create_cluster
+
 agent_requirements:
 	./agent/01_agent_requirements.sh
 
@@ -46,6 +52,9 @@ agent_remove_extraworker_nodes:
 agent_post_install_validation:
 	./agent/agent_post_install_validation.sh
 
+agent_clone_agent_installer_utils:
+	./agent/08_agent_clone_agent_installer_utils.sh
+
 redeploy: ocp_cleanup ironic_cleanup build_installer ironic install_config ocp_run bell
 
 requirements:

agent/01_agent_requirements.sh

@@ -50,3 +50,7 @@ if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISCSI" ]]; then
     # Install shell to administer local storage
     sudo dnf -y install targetcli
 fi
+
+if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]]; then
+    sudo dnf -y install xorriso coreos-installer
+fi

agent/06_agent_create_cluster.sh

@@ -12,6 +12,7 @@ source $SCRIPTDIR/validation.sh
 source $SCRIPTDIR/release_info.sh
 source $SCRIPTDIR/agent/common.sh
 source $SCRIPTDIR/agent/iscsi_utils.sh
+source $SCRIPTDIR/agent/e2e/agent-tui/utils.sh
 
 early_deploy_validation
 
@@ -80,6 +81,15 @@ function create_config_image() {
     cp -r ${config_image_dir}/auth ${asset_dir}
 }
 
+function create_agent_iso_no_registry() {
+  # Create agent ISO without registry a.k.a. OVE ISO
+  local asset_dir=${1}
+  pushd .
+  cd $OPENSHIFT_AGENT_INSTALER_UTILS_PATH/tools/iso_builder
+  ./hack/build-ove-image.sh --pull-secret-file "${PULL_SECRET_FILE}" --release-image-url "${OPENSHIFT_RELEASE_IMAGE}" --dir "${asset_dir}"
+  popd
+}
+
 function set_device_config_image() {
 
     for (( n=0; n<${2}; n++ ))
@@ -152,6 +162,40 @@ function attach_appliance_diskimage() {
     done
 }
 
+function attach_agent_iso_no_registry() {
+    set_file_acl
+
+    local base_dir=$SCRIPTDIR/$OCP_DIR
+    local iso_name="agent-ove.$(uname -p).iso"
+    local agent_iso_no_registry=$(find "$base_dir" -type f -name "$iso_name" 2>/dev/null | head -n 1)
+
+    for (( n=0; n<${2}; n++ ))
+    do
+        name=${CLUSTER_NAME}_${1}_${n}
+        sudo virt-xml ${name} --add-device --disk "${agent_iso_no_registry}",device=cdrom,target.dev=sdc
+        sudo virt-xml ${name} --edit target=sda --disk="boot_order=1"
+        sudo virt-xml ${name} --edit target=sdc --disk="boot_order=2" --start
+        echo "Waiting for 3 mins to arrive at agent-tui screen"
+        sleep 180
+        ./agent/e2e/agent-tui/test-no-registry-agent-tui.sh $name
+        echo "Finished configuring the rendezvousIP via agent-tui for $name"
+    done
+}
+
+function check_assisted_install_UI(){
+  local rendezvousIP=$(getRendezvousIP)
+  local url="http://$rendezvousIP:3001"
+  while true; do
+    if curl -s -o /dev/null -w "%{http_code}" "$url" | grep -q "^200$"; then
+      echo "Assisted install UI is up: $url"
+      break
+    else
+      echo "Assisted install UI not ready, retrying in 5 seconds..."
+      sleep 5
+    fi
+  done
+}
+
 function get_node0_ip() {
   node0_name=$(printf ${MASTER_HOSTNAME_FORMAT} 0)
   node0_ip=$(sudo virsh net-dumpxml ostestbm | xmllint --xpath "string(//dns[*]/host/hostname[. = '${node0_name}']/../@ip)" -)
@@ -435,9 +479,11 @@ function put_operator_file() {
   ssh "${ssh_opts[@]}" "sudo cp /home/core/operators.yaml /etc/assisted/manifests/."
 }
 
-asset_dir="${1:-${OCP_DIR}}"
-config_image_dir="${1:-${OCP_DIR}/configimage}"
-openshift_install="$(realpath "${OCP_DIR}/openshift-install")"
+if [[ "${AGENT_E2E_TEST_BOOT_MODE}" != "ISO_NO_REGISTRY" ]]; then
+  asset_dir="${1:-${OCP_DIR}}"
+  config_image_dir="${1:-${OCP_DIR}/configimage}"
+  openshift_install="$(realpath "${OCP_DIR}/openshift-install")"
+fi
 
 case "${AGENT_E2E_TEST_BOOT_MODE}" in
   "ISO" )
@@ -499,6 +545,23 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
     # (to avoid storage overconsumption on the CI machine)
     sudo rm -f "${OCP_DIR}/appliance.raw"
     ;;
+  "ISO_NO_REGISTRY" )
+    # Build an (OVE) image which does not need registry setup 
+    # Run a script from agent-installer-utils which internally uses openshift-appliance
+    asset_dir=$SCRIPTDIR/$OCP_DIR/iso_builder
+    mkdir -p ${asset_dir}
+    create_agent_iso_no_registry ${asset_dir}
+
+    attach_agent_iso_no_registry master $NUM_MASTERS
+    attach_agent_iso_no_registry worker $NUM_WORKERS
+
+    # In case of SNO, wait for additional 3 minutes for the node
+    # to finish booting up and make sure UI is up
+    if [[ "${NUM_MASTERS}" == "1" ]]; then
+      sleep 180
+    fi
+    check_assisted_install_UI
+    ;;
 esac
 
 if [ ! -z "${AGENT_TEST_CASES:-}" ]; then
@@ -528,17 +591,24 @@ if [[ ! -z $AGENT_OPERATORS ]]; then
     put_operator_file
 fi
 
-wait_for_cluster_ready
+# Current goal is to only verify if the nodes are booted fine,
+# TUI sets the rendezvous IP correctly and UI is accessible.
+# The next goal is to simulate adding the cluster details via UI
+# and complete the cluster installation.
+if [[ "${AGENT_E2E_TEST_BOOT_MODE}" != "ISO_NO_REGISTRY" ]]; then
+    wait_for_cluster_ready
+fi
 
 if [ ! -z "${AGENT_DEPLOY_MCE}" ]; then
   mce_complete_deployment
 fi
 
 # e2e test configuration
-
-# Configure storage for the image registry
-oc patch configs.imageregistry.operator.openshift.io \
-    cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}},"managementState":"Managed"}}'
+if [[ "${AGENT_E2E_TEST_BOOT_MODE}" != "ISO_NO_REGISTRY" ]]; then
+  # Configure storage for the image registry
+  oc patch configs.imageregistry.operator.openshift.io \
+      cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}},"managementState":"Managed"}}'
+fi
 
 if [[ ! -z "${ENABLE_LOCAL_REGISTRY}" ]]; then        
     # Configure tools image registry and cluster samples operator 

agent/08_agent_clone_agent_installer_utils.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+
+LOGDIR=${SCRIPTDIR}/logs
+source $SCRIPTDIR/logging.sh
+source common.sh
+source utils.sh
+source ocp_install_env.sh
+source validation.sh
+
+function clone_agent_installer_utils() {
+  # Clone repo, if not already present
+  if [[ ! -d $OPENSHIFT_AGENT_INSTALER_UTILS_PATH ]]; then
+    sync_repo_and_patch go/src/github.com/openshift/agent-installer-utils https://github.com/openshift/agent-installer-utils.git
+  fi
+}
+
+early_deploy_validation
+
+write_pull_secret
+
+# Extract an updated client tools from the release image
+extract_oc "${OPENSHIFT_RELEASE_IMAGE}"
+
+clone_agent_installer_utils

agent/cleanup.sh

@@ -29,6 +29,10 @@ if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "DISKIMAGE" ]]; then
     sudo podman rmi -f ${APPLIANCE_IMAGE} || true
 fi
 
+if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]]; then
+    sudo rm -rf "${OCP_DIR}/iso_builder"
+fi
+
 if [[ -d ${BOOT_SERVER_DIR} ]]; then
    sudo pkill agentpxeserver || true
    rm -rf ${BOOT_SERVER_DIR}

agent/e2e/agent-tui/test-fix-wrong-dns.sh

@@ -1,88 +1,15 @@
 #!/bin/bash
 
-source common.sh
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../../" && pwd )"
+source $SCRIPTDIR/common.sh
+source $SCRIPTDIR/agent/e2e/agent-tui/utils.sh
+
 set +x
 
 CLUSTER_NAME=$1
 GOOD_DNS_IP=$2
 OCP_VERSION=$3
 
-### utils function for sending various keys and/or text to the console
-
-function _pressKey() {
-  local keyCode=$@
-
-  name=${CLUSTER_NAME}_master_0
-  sudo virsh send-key $name $keyCode
-
-  # On some CI instances, the sequence of events appears to be too fast
-  # for the console refresh, leading the test in the wrong state.
-  # Let's add a small pause between one keypress event and the subsequent
-  sleep 1
-}
-
-function pressKey() {
-  local msg=$1
-  local keyCode=$2
-  local numReps=1
-
-  if [ ! -z "$3" ]; then
-    numReps=$3
-    echo "$msg ($numReps)"
-  else
-    echo $msg
-  fi	
-  
-  for i in $(seq 1 $numReps); do
-    _pressKey $keyCode
-  done
-}
-
-function pressEnter() {
-  pressKey "$1" KEY_ENTER "$2"
-}
-
-function pressTab() {
-  pressKey "$1" KEY_TAB "$2"
-}	
-
-function pressDown() {
-  pressKey "$1" KEY_DOWN "$2"
-}
-
-function pressBackspace() {
-  pressKey "$1" KEY_BACKSPACE "$2"
-}
-
-
-function pressEsc() {
-  pressKey "$1" KEY_ESC "$2"
-}
-
-function pressKeys(){
-  local msg=$1
-  local text=$2
-
-  echo $msg
-
-  local reNumber='[0-9]'
-  local reUpperText='[A-Z]'
-  for (( i=0; i<${#text}; i++ )); do
-    local c=${text:$i:1}
-
-    if [[ $c =~ ['a-z'] ]]; then
-      c=$(echo $c | tr '[:lower:]' '[:upper:]')
-    elif [[ $c =~ ['\.'] ]]; then
-      c="DOT"
-    elif [[ $c =~ [':'] ]]; then
-      c="LEFTSHIFT KEY_SEMICOLON"
-    fi
-
-    local keyCode="KEY_"$c
-    _pressKey $keyCode
-  done
-}
-
 ### Prereq: create an agent ISO using an incorrect DNS address in the agent-config.yaml
 ### This can be done by setting AGENT_E2E_TEST_TUI_BAD_DNS to true in config_<user>.sh
 

agent/e2e/agent-tui/test-no-registry-agent-tui.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../../" && pwd )"
+source $SCRIPTDIR/common.sh
+source $SCRIPTDIR/agent/e2e/agent-tui/utils.sh
+
+set +x
+shopt -s nocasematch
+
+node_name=$1
+
+# The following commands sends key presses through "virsh send-key" to interact
+# with agent-tui
+if [[ "$node_name" == "${CLUSTER_NAME}_master_0" ]]; then
+    pressDown "Save Rendezvous IP" 1
+    pressDown "Designate this node as the Rendezvous node by selecting one of its IPs" 1
+    pressEnter "Designate this node as the Rendezvous node by selecting one of its IPs"
+    pressEnter "" 
+    pressEnter "Continue with installation"
+else
+    # Since master_0 is the first node to boot and is correctly set as the rendezvous node,
+    # this else block retrieves the rendezvousIP and automatically inputs it into the TUI text field
+    # on all other nodes to ensure proper cluster joining.
+    rendezvousIP=$(getRendezvousIP)
+
+    typeIPAddress "Entering IP address" "$rendezvousIP" "$node_name"
+    pressDown "Save Rendezvous IP" 1 "$node_name"
+    pressEnter "" "" "$node_name"
+    pressEnter "Continue with installation" "" "$node_name"
+fi