Review suggestions

Author: pawanpinjarkar

Makefile

@@ -17,7 +17,7 @@ agent_plus_add_node: agent agent_add_extraworker_nodes
 # 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_configure agent_create_cluster
+agent_iso_no_registry: agent_requirements requirements configure agent_configure agent_create_cluster
 
 agent_requirements:
 	./agent/01_agent_requirements.sh
@@ -52,8 +52,6 @@ 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
 

agent/01_agent_requirements.sh

@@ -4,13 +4,23 @@ set -o pipefail
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
+LOGDIR=${SCRIPTDIR}/logs
+source $SCRIPTDIR/logging.sh
 source $SCRIPTDIR/common.sh
 source $SCRIPTDIR/agent/common.sh
 source $SCRIPTDIR/utils.sh
+source $SCRIPTDIR/ocp_install_env.sh
 source $SCRIPTDIR/validation.sh
 
 early_deploy_validation
 
+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
+}
+
 if [[ -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
     printf "\nAGENT_E2E_TEST_SCENARIO is missing or empty. Did you forget to set the AGENT_E2E_TEST_SCENARIO env var in the config_<USER>.sh file?"
     invalidAgentValue
@@ -52,5 +62,14 @@ if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISCSI" ]]; then
 fi
 
 if [[ "${AGENT_E2E_TEST_BOOT_MODE}" == "ISO_NO_REGISTRY" ]]; then
-    sudo dnf -y install xorriso coreos-installer
+   sudo dnf -y install xorriso coreos-installer syslinux
+    
+   early_deploy_validation
+
+   write_pull_secret
+
+   # Extract an updated client tools from the release image
+   extract_oc "${OPENSHIFT_RELEASE_IMAGE}"
+
+   clone_agent_installer_utils
 fi

agent/05_agent_configure.sh

@@ -14,6 +14,7 @@ source $SCRIPTDIR/agent/common.sh
 source $SCRIPTDIR/oc_mirror.sh
 
 early_deploy_validation
+mkdir -p $OCP_DIR
 
 export CLUSTER_NAMESPACE=${CLUSTER_NAMESPACE:-"cluster0"}
 

agent/06_agent_create_cluster.sh

@@ -177,7 +177,7 @@ function attach_agent_iso_no_registry() {
         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
+        ./agent/e2e/agent-tui/automate-no-registry-agent-tui.sh $name
         echo "Finished configuring the rendezvousIP via agent-tui for $name"
     done
 }
@@ -551,19 +551,22 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
     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 [[ "${AGENT_E2E_TEST_BOOT_MODE}" != "ISO_NO_REGISTRY" ]]; then
+    # 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.
+    exit 0
+fi
+
 if [ ! -z "${AGENT_TEST_CASES:-}" ]; then
   run_agent_test_cases
 fi
@@ -591,24 +594,17 @@ if [[ ! -z $AGENT_OPERATORS ]]; then
     put_operator_file
 fi
 
-# 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
+
+wait_for_cluster_ready
 
 if [ ! -z "${AGENT_DEPLOY_MCE}" ]; then
   mce_complete_deployment
 fi
 
 # e2e test configuration
-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
+# Configure storage for the image registry
+oc patch configs.imageregistry.operator.openshift.io \
+    cluster --type merge --patch '{"spec":{"storage":{"emptyDir":{}},"managementState":"Managed"}}'
 
 if [[ ! -z "${ENABLE_LOCAL_REGISTRY}" ]]; then        
     # Configure tools image registry and cluster samples operator 

agent/08_agent_clone_agent_installer_utils.sh

@@ -795,7 +795,8 @@ set -x
 # The default value for AGENT_E2E_TEST_BOOT_MODE is 'ISO'.
 # For the openshift-appliance flow, set the boot mode to 'DISKIMAGE'.
 # To generate PXE assets, set the boot mode to 'PXE'.
-# To generate an ISO without registry a.k.a. OVE ISO, set the boot mode to 'ISO_NO_REGISTRY'.
+# To generate an ISO that can be used in a disconnected environment 
+# without using a registry a.k.a. OVE ISO, set the boot mode to 'ISO_NO_REGISTRY'.
 # AGENT_E2E_TEST_BOOT_MODE=ISO
 
 # Uncomment and set the following value to "true" to enable a test scenario