From 84431656da90478fdc2a60cf38343203e5a60113 Mon Sep 17 00:00:00 2001 From: Sergio Cazzolato Date: Wed, 29 Jul 2026 11:58:31 -0300 Subject: [PATCH 1/3] tests: fix nested tests for amd64 in uc26 This change allows to run nested tests in beta channel where we have image channes and gadget channel with stable. --- tests/lib/nested.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/lib/nested.sh b/tests/lib/nested.sh index c99e70ddd30..e8bbfdc3986 100755 --- a/tests/lib/nested.sh +++ b/tests/lib/nested.sh @@ -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() { @@ -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() { From 18cc4b17a9a2ae580c465d788ff3a970d85e8169 Mon Sep 17 00:00:00 2001 From: Sergio Cazzolato Date: Wed, 29 Jul 2026 15:54:52 -0300 Subject: [PATCH 2/3] update key permissions --- spread.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/spread.yaml b/spread.yaml index 92c73d60601..f56b1310047 100644 --- a/spread.yaml +++ b/spread.yaml @@ -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 @@ -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 @@ -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 @@ -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 From fbf0b7556b6a6ad666c385b5415ceb13b7b716a4 Mon Sep 17 00:00:00 2001 From: Sergio Cazzolato Date: Wed, 29 Jul 2026 16:14:48 -0300 Subject: [PATCH 3/3] using NESTED_REMOTE_USER_NAME instead of user1 --- tests/lib/nested.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/nested.sh b/tests/lib/nested.sh index e8bbfdc3986..b89b17add6c 100755 --- a/tests/lib/nested.sh +++ b/tests/lib/nested.sh @@ -1813,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