From fe880c2d80f863c570ecc062f79fc32da3b6e7c3 Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Tue, 9 Jun 2026 11:56:50 +0200
Subject: [PATCH 1/8] NO-JIRA: Fix hardcoded x86_64 references in agent and
 boot-image paths

Replace hardcoded x86_64 architecture strings with $(uname -m) or
${ARCH} so that agent-based installation scripts work on aarch64
hosts (e.g. AWS Graviton bare metal).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 agent/01_agent_requirements.sh          | 2 +-
 agent/07_agent_add_extraworker_nodes.sh | 2 +-
 agent/common.sh                         | 2 +-
 agent/iscsi_utils.sh                    | 4 ++--
 agent/iso_no_registry.sh                | 6 +++---
 rhcos.sh                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/agent/01_agent_requirements.sh b/agent/01_agent_requirements.sh
index 5a60a6466..456a40b47 100755
--- a/agent/01_agent_requirements.sh
+++ b/agent/01_agent_requirements.sh
@@ -41,7 +41,7 @@ if [[ "${MIRROR_COMMAND}" == oc-mirror ]]; then
    oc_mirror_file=oc-mirror.tar.gz
    oc_mirror_exec=${oc_mirror_file%%.*}
    if [[ ! -f "/usr/local/bin/${oc_mirror_exec}" ]]; then
-      curl -O -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/${oc_mirror_file}
+      curl -O -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/${oc_mirror_file}
       tar xzf ${oc_mirror_file}
       chmod +x "${oc_mirror_exec}"
       sudo mv -f "${oc_mirror_exec}" /usr/local/bin
diff --git a/agent/07_agent_add_extraworker_nodes.sh b/agent/07_agent_add_extraworker_nodes.sh
index 277c52b46..edfe5690d 100755
--- a/agent/07_agent_add_extraworker_nodes.sh
+++ b/agent/07_agent_add_extraworker_nodes.sh
@@ -76,7 +76,7 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
 
     for (( n=0; n < NUM_EXTRA_WORKERS; n++ ))
     do
-        sudo virt-xml "${CLUSTER_NAME}_extraworker_${n}" --add-device --disk "$OCP_DIR/add-node//node.x86_64.iso,device=cdrom,target.dev=sdc"
+        sudo virt-xml "${CLUSTER_NAME}_extraworker_${n}" --add-device --disk "$OCP_DIR/add-node//node.$(uname -m).iso,device=cdrom,target.dev=sdc"
         sudo virt-xml "${CLUSTER_NAME}_extraworker_${n}" --edit target=sda --disk="boot_order=1"
         sudo virt-xml "${CLUSTER_NAME}_extraworker_${n}" --edit target=sdc --disk="boot_order=2" --start
     done
diff --git a/agent/common.sh b/agent/common.sh
index 9579aff24..a0421a933 100644
--- a/agent/common.sh
+++ b/agent/common.sh
@@ -48,7 +48,7 @@ export EXTRA_MANIFESTS_PATH="${OCP_DIR}/openshift"
 #    in install-config.yaml, OR
 # 3. ISCSI, to contain the iPXE file needed for iSCSI booting
 export BOOT_SERVER_DIR=${WORKING_DIR}/boot-artifacts
-export PXE_BOOT_FILE=agent.x86_64.ipxe
+export PXE_BOOT_FILE=agent.$(uname -m).ipxe
 # FIXME:  agent/common.sh is sourced without network.sh
 # wrap_if_ipv6 and PROVISIONING_HOST_EXTERNAL_IP are undefined
 # errors masked by export which returns true
diff --git a/agent/iscsi_utils.sh b/agent/iscsi_utils.sh
index b5e6b2692..20b100714 100755
--- a/agent/iscsi_utils.sh
+++ b/agent/iscsi_utils.sh
@@ -31,7 +31,7 @@ function agent_create_iscsi_network() {
   <ip address="${ISCSI_NETWORK_SUBNET}.1" netmask="255.255.255.0">
     <dhcp>
       <range start='${ISCSI_NETWORK_SUBNET}.20' end='${ISCSI_NETWORK_SUBNET}.120'/>
-      <bootp file='http://${ISCSI_NETWORK_SUBNET}.1:8089/agent.x86_64-iscsi.ipxe'/>
+      <bootp file='http://${ISCSI_NETWORK_SUBNET}.1:8089/agent.$(uname -m)-iscsi.ipxe'/>
     </dhcp>
   </ip>
 </network>
@@ -79,7 +79,7 @@ function agent_create_iscsi_pxe_file() {
 
     # Set 'hostname' variable in file. It will be resolved by host during PXE boot
     # in order to access a unique target for this host.
-cat > "${boot_dir}/agent.x86_64-iscsi.ipxe" << EOF
+cat > "${boot_dir}/agent.$(uname -m)-iscsi.ipxe" << EOF
 #!ipxe
 set initiator-iqn ${ISCSI_INITIATOR_BASE}:\${hostname}
 sanboot --keep iscsi:${ISCSI_NETWORK_SUBNET}.1::::${ISCSI_INITIATOR_BASE}:\${hostname}
diff --git a/agent/iso_no_registry.sh b/agent/iso_no_registry.sh
index d3397d6e2..e71925ac3 100755
--- a/agent/iso_no_registry.sh
+++ b/agent/iso_no_registry.sh
@@ -106,7 +106,7 @@ function create_agent_iso_no_registry() {
 
 # Deletes all files and directories under asset_dir
 # example, ocp/ostest/iso_builder/4.19.* 
-# except the final generated ISO file (agent-ove.x86_64.iso), 
+# except the final generated ISO file (agent-ove.${ARCH}.iso),
 # to free up disk space while preserving the built artifact.
 # Note: This optional cleanup is relevant only when the
 # AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV is set as as true, 
@@ -119,8 +119,8 @@ function cleanup_diskspace_agent_iso_noregistry() {
 
     echo "Cleaning up directory: $dir"
 
-    # Delete all files and symlinks except the agent-ove.x86_64.iso
-    sudo find "$dir" \( -type f -o -type l \) ! -name 'agent-ove.x86_64.iso' -print -delete
+    # Delete all files and symlinks except the agent-ove ISO
+    sudo find "$dir" \( -type f -o -type l \) ! -name "agent-ove.${ARCH}.iso" -print -delete
 
     # Remove any empty directories left behind
     sudo find "$dir" -type d -empty -print -delete
diff --git a/rhcos.sh b/rhcos.sh
index 399377726..a092052ef 100644
--- a/rhcos.sh
+++ b/rhcos.sh
@@ -1,6 +1,6 @@
 if $OPENSHIFT_INSTALLER coreos print-stream-json >/dev/null 2>&1; then
     $OPENSHIFT_INSTALLER coreos print-stream-json > "$OCP_DIR/rhcos.json"
-    TOP_LEVEL_FORMAT="$(jq -r '.architectures.x86_64.artifacts.openstack.formats | keys[]' "$OCP_DIR/rhcos.json" | head -n1)"
+    TOP_LEVEL_FORMAT="$(jq -r ".architectures.$(uname -m).artifacts.openstack.formats | keys[]" "$OCP_DIR/rhcos.json" | head -n1)"
     MACHINE_OS_INSTALLER_IMAGE_URL=$(jq -r ".architectures.$(uname -m).artifacts.openstack.formats[\"${TOP_LEVEL_FORMAT}\"].disk.location" "$OCP_DIR/rhcos.json")
     export MACHINE_OS_INSTALLER_IMAGE_URL
     MACHINE_OS_INSTALLER_IMAGE_SHA256=$(jq -r ".architectures.$(uname -m).artifacts.openstack.formats[\"${TOP_LEVEL_FORMAT}\"].disk[\"sha256\"]" "$OCP_DIR/rhcos.json")

From 15c417fff531cc73d30f3dc889f8f4f51d25f765 Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Tue, 9 Jun 2026 11:04:13 +0200
Subject: [PATCH 2/8] NO-JIRA: Fix aarch64 CPU model for native KVM deployments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The metal3-dev-env baremetalvm.xml.j2 template hardcodes cortex-a57
for all aarch64 VMs. This CPU model only works under QEMU emulation;
native aarch64 KVM (e.g. AWS Graviton bare metal) requires
host-passthrough.

Narrow the CPU-section conditional from `{% if is_aarch64 %}` to
`{% if is_aarch64 and libvirt_domain_type == 'qemu' %}` so that
native KVM falls through to host-passthrough. The other three
is_aarch64 blocks (<os>, <features>, VNC) are unaffected — the sed
targets only the CPU block by matching its adjacent HTML comment line.

Tested on AWS c7g.metal (Graviton3) with OCP 4.22.0-rc.5 — full
fencing-IPI deployment with Pacemaker/STONITH operational.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 02_configure_host.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/02_configure_host.sh b/02_configure_host.sh
index f6bcb1a97..a43c67d5e 100755
--- a/02_configure_host.sh
+++ b/02_configure_host.sh
@@ -129,6 +129,15 @@ export VNC_CONSOLE=true
 if [[ $(uname -m) == "aarch64" ]]; then
   VNC_CONSOLE=false
   echo "libvirt_cdrombus: scsi" >> vm_setup_vars.yml
+  # On native aarch64 KVM (e.g. AWS Graviton), the upstream metal3-dev-env
+  # template hardcodes cortex-a57 for all aarch64 VMs. That model only works
+  # under qemu emulation; native KVM requires host-passthrough. Narrow the
+  # CPU conditional so native aarch64 falls through to host-passthrough,
+  # without affecting the <os> or <features> sections that must still fire.
+  TEMPLATE="${VM_SETUP_PATH}/roles/libvirt/templates/baremetalvm.xml.j2"
+  if [ -f "${TEMPLATE}" ]; then
+    sed -i '/{% if is_aarch64 %}/{N; /<!--/s/{% if is_aarch64 %}/{% if is_aarch64 and libvirt_domain_type == '"'"'qemu'"'"' %}/}' "${TEMPLATE}"
+  fi
 fi
 
 # playbooks depend on it

From 2220fa2864b5833f1438aa96aa5ccea5fe88b99b Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Tue, 9 Jun 2026 14:18:00 +0200
Subject: [PATCH 3/8] NO-JIRA: Fix virt-xml CDROM bus for aarch64 agent install

On aarch64 (virt machine type), virt-xml defaults the CDROM bus to USB
when no bus is specified. The virt machine type has no USB controller,
causing "USB is disabled for this domain" errors when attaching the
agent ISO at step 06.

Set target.bus explicitly on all five virt-xml CDROM attachment calls:
sata on x86_64 (q35 default), scsi on aarch64 (matching the bus
already configured by 02_configure_host.sh).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 agent/06_agent_create_cluster.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/agent/06_agent_create_cluster.sh b/agent/06_agent_create_cluster.sh
index 1034068aa..f7cfcfab3 100755
--- a/agent/06_agent_create_cluster.sh
+++ b/agent/06_agent_create_cluster.sh
@@ -5,6 +5,11 @@ shopt -s nocasematch
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 ARCH=$(uname -m)
 
+CDROM_BUS="sata"
+if [[ "${ARCH}" == "aarch64" ]]; then
+    CDROM_BUS="scsi"
+fi
+
 LOGDIR="${SCRIPTDIR}/logs"
 source "$SCRIPTDIR/logging.sh"
 source "$SCRIPTDIR/common.sh"
@@ -143,13 +148,13 @@ function attach_agent_iso() {
     for (( n=0; n<${2}; n++ ))
     do
         name=${CLUSTER_NAME}_${1}_${n}
-        sudo virt-xml "${name}" --add-device --disk "${agent_iso}",device=cdrom,target.dev=sdc
+        sudo virt-xml "${name}" --add-device --disk "${agent_iso}",device=cdrom,target.dev=sdc,target.bus=${CDROM_BUS}
 	if [ "${AGENT_USE_APPLIANCE_MODEL}" == true ]; then
 	    if [ "${AGENT_APPLIANCE_HOTPLUG}" == true ]; then
                 # Add the device with no image. It will be added later using change-media when config-drive is created
-                sudo virt-xml "${name}" --add-device --disk device=cdrom,target.dev="${config_image_drive}"
+                sudo virt-xml "${name}" --add-device --disk device=cdrom,target.dev="${config_image_drive}",target.bus=${CDROM_BUS}
 	    else
-	        sudo virt-xml "${name}" --add-device --disk "${config_image_dir}/agentconfig.noarch.iso,device=cdrom,target.dev=${config_image_drive}"
+	        sudo virt-xml "${name}" --add-device --disk "${config_image_dir}/agentconfig.noarch.iso,device=cdrom,target.dev=${config_image_drive},target.bus=${CDROM_BUS}"
 	    fi
         fi
         sudo virt-xml "${name}" --edit target=sda --disk="boot_order=1"
@@ -175,8 +180,8 @@ function attach_appliance_diskimage() {
         # Attach the appliance disk image and the config ISO 
         sudo virt-xml "${name}" --remove-device --disk all
         sudo virt-xml "${name}" --add-device --disk "${disk_image}",device=disk,target.dev=sda
-        sudo virt-xml "${name}" --add-device --disk "${config_image_dir}/agentconfig.noarch.iso,device=cdrom,target.dev=${config_image_drive}"
-        
+        sudo virt-xml "${name}" --add-device --disk "${config_image_dir}/agentconfig.noarch.iso,device=cdrom,target.dev=${config_image_drive},target.bus=${CDROM_BUS}"
+
         # Boot machine from the appliance disk image
         sudo virt-xml "${name}" --edit target=sda --disk="boot_order=1" --start
     done
@@ -190,7 +195,7 @@ function attach_agent_iso_no_registry() {
     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}" --add-device --disk "${agent_iso_no_registry}",device=cdrom,target.dev=sdc,target.bus=${CDROM_BUS}
         sudo virt-xml "${name}" --edit target=sda --disk="boot_order=1"
         sudo virt-xml "${name}" --edit target=sdc --disk="boot_order=2" --start
     done

From b610443ff5210bd07461381813672ed55ff6f88f Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Thu, 11 Jun 2026 11:11:29 +0200
Subject: [PATCH 4/8] NO-JIRA: Fix Go tarball arch for aarch64 in
 metal3-dev-env

The pinned metal3-dev-env hardcodes `linux-amd64` in the go_tarball
template variable. The 01_install_requirements.sh script already
detects the host architecture and passes GOARCH as an Ansible extra
var, but the template ignores it.

Add a sed patch (alongside the existing Ansible version patch) to
make go_tarball use the GOARCH variable, so the correct Go binary
is downloaded on aarch64 hosts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 01_install_requirements.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/01_install_requirements.sh b/01_install_requirements.sh
index 919b8d99c..ddc63c986 100755
--- a/01_install_requirements.sh
+++ b/01_install_requirements.sh
@@ -25,6 +25,10 @@ if [ -z "${METAL3_DEV_ENV:-}" ]; then
   # Patch metal3-dev-env to use Ansible 8.x on centos9/rhel9.
   sed -i '/ANSIBLE_VERSION/{ s/10\.7\.0/8.7.0/; }' lib/common.sh
 
+  # Go tarball defaults hardcode linux-amd64; use GOARCH passed as extra var.
+  sed -i 's/go_tarball: "go{{ go_version }}.linux-amd64.tar.gz"/go_tarball: "go{{ go_version }}.linux-{{ GOARCH | default('\''amd64'\'') }}.tar.gz"/' \
+    vm-setup/roles/packages_installation/defaults/main.yml
+
   popd
 fi
 

From e1fe842691d08e1eea048166aecf27b76c25a375 Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Thu, 11 Jun 2026 22:29:01 +0200
Subject: [PATCH 5/8] NO-JIRA: Eject CDROM on aarch64 after agent ISO boot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On aarch64 (virt machine type), AAVMF firmware does not reliably honor
boot_order for SCSI CDROM vs virtio disk. After the agent-based installer
writes the OS to disk and reboots, VMs boot back into the installation
ISO instead of from disk, causing installing-pending-user-action timeout.

Fix: eject CDROM media after VMs have booted from the ISO. The CoreOS
live agent runs entirely in RAM, so the ISO is not needed after boot.
When the agent triggers a reboot after image write, the empty CDROM is
skipped and the VM boots from disk.

Gated on aarch64 only — x86_64 OVMF handles boot_order correctly.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 agent/06_agent_create_cluster.sh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/agent/06_agent_create_cluster.sh b/agent/06_agent_create_cluster.sh
index f7cfcfab3..d9daf594d 100755
--- a/agent/06_agent_create_cluster.sh
+++ b/agent/06_agent_create_cluster.sh
@@ -201,6 +201,14 @@ function attach_agent_iso_no_registry() {
     done
 }
 
+function eject_agent_iso() {
+    for (( n=0; n<${2}; n++ ))
+    do
+        name=${CLUSTER_NAME}_${1}_${n}
+        sudo virsh change-media "${name}" sdc --eject --live
+    done
+}
+
 function automate_rendezvousIP_selection(){
   for (( n=0; n<${2}; n++ ))
     do
@@ -550,6 +558,15 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
     attach_agent_iso worker "$NUM_WORKERS"
     attach_agent_iso arbiter "$NUM_ARBITERS"
 
+    if [[ "${ARCH}" == "aarch64" ]]; then
+        echo "aarch64: waiting for VMs to boot from ISO before ejecting CDROM..."
+        sleep 90
+        eject_agent_iso master "$NUM_MASTERS"
+        eject_agent_iso worker "$NUM_WORKERS"
+        eject_agent_iso arbiter "$NUM_ARBITERS"
+        echo "aarch64: CDROM media ejected from all VMs"
+    fi
+
     ;;
 
   "PXE" )
@@ -624,6 +641,14 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
 
     echo "Waiting for 2 mins to arrive at agent-tui screen"
     sleep 120
+
+    if [[ "${ARCH}" == "aarch64" ]]; then
+        eject_agent_iso master "$NUM_MASTERS"
+        eject_agent_iso worker "$NUM_WORKERS"
+        eject_agent_iso arbiter "$NUM_ARBITERS"
+        echo "aarch64: CDROM media ejected from all VMs"
+    fi
+
     automate_rendezvousIP_selection master "$NUM_MASTERS"
     automate_rendezvousIP_selection worker "$NUM_WORKERS"
     automate_rendezvousIP_selection arbiter "$NUM_ARBITERS"

From ad256a68976cb6ab6b51101f386df703d256ed66 Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Fri, 12 Jun 2026 14:23:52 +0200
Subject: [PATCH 6/8] NO-JIRA: Increase CDROM eject delay to 5 min on aarch64

90 seconds was not enough for AAVMF firmware to enumerate SCSI
devices and boot the ISO on the virt machine type. VMs were still
in UEFI initialization when the CDROM was ejected, leaving them
with no bootable media.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 agent/06_agent_create_cluster.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/agent/06_agent_create_cluster.sh b/agent/06_agent_create_cluster.sh
index d9daf594d..4dd1f9445 100755
--- a/agent/06_agent_create_cluster.sh
+++ b/agent/06_agent_create_cluster.sh
@@ -559,8 +559,8 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
     attach_agent_iso arbiter "$NUM_ARBITERS"
 
     if [[ "${ARCH}" == "aarch64" ]]; then
-        echo "aarch64: waiting for VMs to boot from ISO before ejecting CDROM..."
-        sleep 90
+        echo "aarch64: waiting 5 min for VMs to boot from ISO before ejecting CDROM..."
+        sleep 300
         eject_agent_iso master "$NUM_MASTERS"
         eject_agent_iso worker "$NUM_WORKERS"
         eject_agent_iso arbiter "$NUM_ARBITERS"

From dbc534173cb9fe7eb7e7fab7f5e5eee9f8f0fcdf Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Fri, 12 Jun 2026 15:26:40 +0200
Subject: [PATCH 7/8] NO-JIRA: Poll agent API before CDROM eject on aarch64

Replace the fixed 5-minute sleep with polling of the assisted-service
REST API. The previous approach ejected the ISO while the agent was
still in the 'installing' phase, reading the CoreOS image from the
ISO to write to disk. This caused "Unable to read from the discovery
media" errors.

The new wait_for_hosts_installed() function polls
/api/assisted-install/v2/clusters/<id>/hosts every 30 seconds until
all hosts reach 'installed' status (disk write complete, about to
reboot). Only then is the CDROM ejected, ensuring AAVMF firmware
boots from disk instead of the ISO on the next boot cycle.

On timeout or error, the CDROM is still ejected (better than leaving
it attached) and wait_for_cluster_ready handles the failure reporting.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 agent/06_agent_create_cluster.sh | 66 +++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/agent/06_agent_create_cluster.sh b/agent/06_agent_create_cluster.sh
index 4dd1f9445..53c9778a6 100755
--- a/agent/06_agent_create_cluster.sh
+++ b/agent/06_agent_create_cluster.sh
@@ -241,6 +241,69 @@ function check_assisted_install_UI(){
   done
 }
 
+function wait_for_hosts_installed() {
+    local rendezvousIP
+    rendezvousIP=$(getRendezvousIP)
+    local base_url="http://$(wrap_if_ipv6 "${rendezvousIP}"):3001"
+    local clusters_url="${base_url}/api/assisted-install/v2/clusters"
+    local expected_hosts=$(( NUM_MASTERS + NUM_WORKERS + NUM_ARBITERS ))
+    local max_attempts=120
+    local sleep_seconds=30
+    local cluster_id=""
+
+    echo "aarch64: waiting for all ${expected_hosts} hosts to reach 'installed' status before ejecting CDROM..."
+
+    set +x
+    for (( attempt=1; attempt<=max_attempts; attempt++ )); do
+        if [[ -z "${cluster_id}" ]]; then
+            cluster_id=$(curl -s -f "${clusters_url}" 2>/dev/null | jq -r '.[0].id // empty' 2>/dev/null) || true
+            if [[ -z "${cluster_id}" ]]; then
+                echo "  Attempt ${attempt}/${max_attempts}: assisted-service API not ready, retrying in ${sleep_seconds}s..."
+                sleep "${sleep_seconds}"
+                continue
+            fi
+        fi
+
+        local hosts_url="${clusters_url}/${cluster_id}/hosts"
+        local hosts_json
+        hosts_json=$(curl -s -f "${hosts_url}" 2>/dev/null) || true
+
+        if [[ -z "${hosts_json}" ]]; then
+            echo "  Attempt ${attempt}/${max_attempts}: could not reach hosts endpoint, retrying in ${sleep_seconds}s..."
+            sleep "${sleep_seconds}"
+            continue
+        fi
+
+        local statuses
+        statuses=$(echo "${hosts_json}" | jq -r '[.[].status] | join(",")' 2>/dev/null) || true
+
+        local error_count
+        error_count=$(echo "${hosts_json}" | jq '[.[].status | select(. == "error" or . == "cancelled")] | length' 2>/dev/null) || true
+        if [[ "${error_count}" -gt 0 ]]; then
+            set -x
+            echo "ERROR: ${error_count} host(s) in error/cancelled state. Statuses: ${statuses}"
+            return 1
+        fi
+
+        local installed_count
+        installed_count=$(echo "${hosts_json}" | jq '[.[].status | select(. == "installed")] | length' 2>/dev/null) || true
+
+        echo "  Attempt ${attempt}/${max_attempts}: ${installed_count:-0}/${expected_hosts} hosts installed (statuses: ${statuses:-unknown})"
+
+        if [[ "${installed_count}" -eq "${expected_hosts}" ]]; then
+            set -x
+            echo "aarch64: all ${expected_hosts} hosts have reached 'installed' status"
+            return 0
+        fi
+
+        sleep "${sleep_seconds}"
+    done
+
+    set -x
+    echo "ERROR: timed out after $((max_attempts * sleep_seconds / 60)) minutes waiting for hosts to reach 'installed' status"
+    return 1
+}
+
 function get_node0_ip() {
   # shellcheck disable=SC2059
   node0_name=$(printf "${MASTER_HOSTNAME_FORMAT}" 0)
@@ -559,8 +622,7 @@ case "${AGENT_E2E_TEST_BOOT_MODE}" in
     attach_agent_iso arbiter "$NUM_ARBITERS"
 
     if [[ "${ARCH}" == "aarch64" ]]; then
-        echo "aarch64: waiting 5 min for VMs to boot from ISO before ejecting CDROM..."
-        sleep 300
+        wait_for_hosts_installed || echo "WARNING: proceeding with CDROM eject despite host status issues"
         eject_agent_iso master "$NUM_MASTERS"
         eject_agent_iso worker "$NUM_WORKERS"
         eject_agent_iso arbiter "$NUM_ARBITERS"

From e1ae0589b9b976fdab79b9d881c67310d08b3d69 Mon Sep 17 00:00:00 2001
From: Pablo Fontanilla <pfontani@redhat.com>
Date: Fri, 12 Jun 2026 17:33:26 +0200
Subject: [PATCH 8/8] NO-JIRA: Make aarch64 sed workarounds conditional

Guard the Go tarball and CPU model sed patches with grep checks so they
become no-ops once the upstream fixes land in metal3-dev-env:
- https://github.com/metal3-io/metal3-dev-env/pull/1694
- https://github.com/metal3-io/metal3-dev-env/pull/1695

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 01_install_requirements.sh | 8 ++++++--
 02_configure_host.sh       | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/01_install_requirements.sh b/01_install_requirements.sh
index ddc63c986..8e93bb5f3 100755
--- a/01_install_requirements.sh
+++ b/01_install_requirements.sh
@@ -26,8 +26,12 @@ if [ -z "${METAL3_DEV_ENV:-}" ]; then
   sed -i '/ANSIBLE_VERSION/{ s/10\.7\.0/8.7.0/; }' lib/common.sh
 
   # Go tarball defaults hardcode linux-amd64; use GOARCH passed as extra var.
-  sed -i 's/go_tarball: "go{{ go_version }}.linux-amd64.tar.gz"/go_tarball: "go{{ go_version }}.linux-{{ GOARCH | default('\''amd64'\'') }}.tar.gz"/' \
-    vm-setup/roles/packages_installation/defaults/main.yml
+  # Upstream fix: https://github.com/metal3-io/metal3-dev-env/pull/1694
+  GO_DEFAULTS="vm-setup/roles/packages_installation/defaults/main.yml"
+  if grep -q 'linux-amd64' "${GO_DEFAULTS}"; then
+    sed -i 's/go_tarball: "go{{ go_version }}.linux-amd64.tar.gz"/go_tarball: "go{{ go_version }}.linux-{{ GOARCH | default('\''amd64'\'') }}.tar.gz"/' \
+      "${GO_DEFAULTS}"
+  fi
 
   popd
 fi
diff --git a/02_configure_host.sh b/02_configure_host.sh
index a43c67d5e..6a234ee6d 100755
--- a/02_configure_host.sh
+++ b/02_configure_host.sh
@@ -134,8 +134,9 @@ if [[ $(uname -m) == "aarch64" ]]; then
   # under qemu emulation; native KVM requires host-passthrough. Narrow the
   # CPU conditional so native aarch64 falls through to host-passthrough,
   # without affecting the <os> or <features> sections that must still fire.
+  # Upstream fix: https://github.com/metal3-io/metal3-dev-env/pull/1694
   TEMPLATE="${VM_SETUP_PATH}/roles/libvirt/templates/baremetalvm.xml.j2"
-  if [ -f "${TEMPLATE}" ]; then
+  if [ -f "${TEMPLATE}" ] && grep -q '{% if is_aarch64 %}' "${TEMPLATE}"; then
     sed -i '/{% if is_aarch64 %}/{N; /<!--/s/{% if is_aarch64 %}/{% if is_aarch64 and libvirt_domain_type == '"'"'qemu'"'"' %}/}' "${TEMPLATE}"
   fi
 fi