Skip to content

tests: fix nested tests for amd64 in uc26 #17417

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

Open
sergiocazzolato wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −18
Open

tests: fix nested tests for amd64 in uc26 #17417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8443165
tests: fix nested tests for amd64 in uc26
sergiocazzolato Jul 29, 2026
18cc4b1
update key permissions
sergiocazzolato Jul 29, 2026
fbf0b75
using NESTED_REMOTE_USER_NAME instead of user1
sergiocazzolato Jul 29, 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
14 changes: 9 additions & 5 deletions spread.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,8 @@ suites:

# Configure the ssh connection to the test vm
if [ -n "$NESTED_REMOTE_USER_CERT" ]; then
echo "$NESTED_REMOTE_USER_CERT" > $TESTSTMP/cert-file
echo "$NESTED_REMOTE_USER_CERT" > "$TESTSTMP"/cert-file
chmod 0600 "$TESTSTMP"/cert-file
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --cert "$TESTSTMP/cert-file"
else
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --pass ubuntu
Expand Down Expand Up @@ -1838,7 +1839,8 @@ suites:
# Configure the ssh connection to the test vm
# Configure the ssh connection to the test vm
if [ -n "$NESTED_REMOTE_USER_CERT" ]; then
echo "$NESTED_REMOTE_USER_CERT" > $TESTSTMP/cert-file
echo "$NESTED_REMOTE_USER_CERT" > "$TESTSTMP"/cert-file
chmod 0600 "$TESTSTMP"/cert-file
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --cert "$TESTSTMP/cert-file"
else
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --pass ubuntu
Expand Down Expand Up @@ -1913,8 +1915,9 @@ suites:

# Configure the ssh connection to the test vm
if [ -n "$NESTED_REMOTE_USER_CERT" ]; then
echo "$NESTED_REMOTE_USER_CERT" > $TESTSTMP/cert-file
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --cert "$TESTSTMP/cert-file"
echo "$NESTED_REMOTE_USER_CERT" > "$TESTSTMP"/cert-file
chmod 0600 "$TESTSTMP"/cert-file
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --cert "$TESTSTMP"/cert-file
else
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --pass ubuntu
fi
Expand Down Expand Up @@ -2002,7 +2005,8 @@ suites:

# Configure the ssh connection to the test vm
if [ -n "$NESTED_REMOTE_USER_CERT" ]; then
echo "$NESTED_REMOTE_USER_CERT" > $TESTSTMP/cert-file
echo "$NESTED_REMOTE_USER_CERT" > "$TESTSTMP"/cert-file
chmod 0600 "$TESTSTMP"/cert-file
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --cert "$TESTSTMP/cert-file"
else
remote.setup config --host localhost --port 8022 --user "$NESTED_REMOTE_USER_NAME" --pass ubuntu
Expand Down
16 changes: 3 additions & 13 deletions tests/lib/nested.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,7 @@ nested_cleanup_env() {
}

nested_get_image_channel() {
if nested_is_core_26_system; then
# TODO: Remove when it becomes available in the other channels
echo "edge"
else
echo "${NESTED_CORE_CHANNEL}"
fi
echo "${NESTED_CORE_CHANNEL}"
}

nested_get_base_channel() {
Expand All @@ -517,12 +512,7 @@ nested_get_kernel_channel() {
}

nested_get_gadget_channel() {
if nested_is_core_26_system; then
# TODO: Remove when it becomes available in the other channels
echo "edge"
else
echo "${NESTED_GADGET_CHANNEL}"
fi
echo "${NESTED_GADGET_CHANNEL}"
}

nested_get_image_name_base() {
Expand Down Expand Up @@ -1823,7 +1813,7 @@ nested_prepare_tools() {
TOOLS_PATH=/writable/test-tools
if ! remote.exec "test -d $TOOLS_PATH" &>/dev/null; then
remote.exec "sudo mkdir -p $TOOLS_PATH"
remote.exec "sudo chown user1:user1 $TOOLS_PATH"
remote.exec "sudo chown $NESTED_REMOTE_USER_NAME:$NESTED_REMOTE_USER_NAME $TOOLS_PATH"
fi

if ! remote.exec "test -e $TOOLS_PATH/retry" &>/dev/null; then
Expand Down
Loading