Skip to content

NO-JIRA: Fix hardcoded x86_64 references in agent and boot-image paths #1910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fonta-rh wants to merge 2 commits into from
Closed

NO-JIRA: Fix hardcoded x86_64 references in agent and boot-image paths #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe880c2
NO-JIRA: Fix hardcoded x86_64 references in agent and boot-image paths
fonta-rh Jun 9, 2026
791e826
NO-JIRA: Fix virt-xml CDROM bus for aarch64 agent install
fonta-rh Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/01_agent_requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions agent/06_agent_create_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/07_agent_add_extraworker_nodes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion agent/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions agent/iscsi_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions agent/iso_no_registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rhcos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down