Wait until ssh is available
This commit is contained in:
parent
f97cb3f10a
commit
24b6749504
5
debug.go
5
debug.go
@ -207,6 +207,11 @@ func debugHandler(kcfg config.KernelConfig, workPath, kernRegex, gdb string,
|
|||||||
}
|
}
|
||||||
defer os.RemoveAll(tmp)
|
defer os.RemoveAll(tmp)
|
||||||
|
|
||||||
|
err = q.WaitForSSH(time.Minute)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if ka.StandardModules {
|
if ka.StandardModules {
|
||||||
// Module depends on one of the standard modules
|
// Module depends on one of the standard modules
|
||||||
err = copyStandardModules(q, ki)
|
err = copyStandardModules(q, ki)
|
||||||
|
5
pew.go
5
pew.go
@ -506,6 +506,11 @@ func whatever(swg *sizedwaitgroup.SizedWaitGroup, ka config.Artifact,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = q.WaitForSSH(qemuTimeout)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
remoteTest, err := copyTest(q, testPath, ka)
|
remoteTest, err := copyTest(q, testPath, ka)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
@ -307,6 +307,20 @@ func (q *System) Stop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (q System) WaitForSSH(timeout time.Duration) error {
|
||||||
|
for start := time.Now(); time.Since(start) < timeout; {
|
||||||
|
client, err := q.ssh("root")
|
||||||
|
if err != nil {
|
||||||
|
time.Sleep(time.Second / 10)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
client.Close()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return errors.New("no ssh (timeout)")
|
||||||
|
}
|
||||||
|
|
||||||
func (q System) ssh(user string) (client *ssh.Client, err error) {
|
func (q System) ssh(user string) (client *ssh.Client, err error) {
|
||||||
cfg := &ssh.ClientConfig{
|
cfg := &ssh.ClientConfig{
|
||||||
User: user,
|
User: user,
|
||||||
|
Loading…
Reference in New Issue
Block a user