Skip to content

Commit 8988c90

Browse files
committed
Merge remote-tracking branch 'origin/main' into k0s-1-29
2 parents 9943131 + 086a9ea commit 8988c90

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

e2e/cluster/lxd/cluster.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,11 @@ func (c *Cluster) RunCommandOnNode(node int, line []string, envs ...map[string]s
10771077
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
10781078
defer cancel()
10791079
if err := Run(ctx, c.T, *cmd); err != nil {
1080+
// check if this is a reset-installation command that resulted in exit code 143
1081+
// as this is expected behavior when the node reboots and the api connection is lost
1082+
if strings.Contains(err.Error(), "143") && strings.Contains(strings.Join(line, " "), "reset-installation") {
1083+
return stdout.String(), stderr.String(), nil
1084+
}
10801085
c.T.Logf("stdout:\n%s", stdout.String())
10811086
c.T.Logf("stderr:\n%s", stderr.String())
10821087
return stdout.String(), stderr.String(), err

0 commit comments

Comments
 (0)