Skip to content

USHIFT-4726: Attempt console login in offline tests #4481

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

Merged
merged 1 commit into from
Jan 30, 2025
Merged

USHIFT-4726: Attempt console login in offline tests #4481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions test/bin/scenario.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ launch_vm() {
vm_extra_args+=" inst.ks=file:/$(basename "${kickstart_file}")"
vm_initrd_inject+=" --initrd-inject ${kickstart_file}"
# Download and inject all the kickstart include files
wget -r -q -nd -A "*.cfg" -P "${kickstart_idir}" "$(dirname "${kickstart_url}")"
wget -r -q -nd -A "*.cfg" -P "${kickstart_idir}" "$(dirname "${kickstart_url}")/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The command would otherwise not work for me, it would redirect to the url with the slash but not download any files. This way it doesn't have to redirect.

Copy link
Contributor

@ggiguash ggiguash Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit strange as it's been working for some time already and it's not related to the current changes.
What's version of wget you have installed? This is what I have, for example.

GNU Wget 1.21.1 built on linux-gnu.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it is strange. I have GNU Wget2 2.2.0. I'll try downgrading then.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, verify that it works for you in the older version with and without changes.
You're probably using Fedora, which has a newer wget version. I'm fine with this change - just need to make sure we're not breaking anything for RHEL 9.4 environments.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested on Wget 1.21.4 on Fedora and it works fine with and without the slash.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so it's the new package update than that introduced this issue.
Let's merge it.

for cfg_file in "${kickstart_idir}"/*.cfg ; do
vm_initrd_inject+=" --initrd-inject ${cfg_file}"
done
Expand Down Expand Up @@ -1076,10 +1076,15 @@ action_login() {
vmname="$1"
fi

ssh_port=$(get_vm_property "${vmname}" "ssh_port")
ssh_port=$(get_vm_property "${vmname}" "ssh_port" || true)
ip=$(get_vm_property "${vmname}" "ip")

ssh "redhat@${ip}" -p "${ssh_port}"
if [ -z "${ssh_port}" ] ; then
local -r full_vmname="$(full_vm_name "${vmname}")"
sudo virsh console "${full_vmname}"
else
ssh "redhat@${ip}" -p "${ssh_port}"
fi
}

action_run() {
Expand Down