Skip to content

Commit 810b5a7

Browse files
fix: increasing build timeout for linux vhds (#8066)
1 parent abede5c commit 810b5a7

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

e2e/vmss.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,6 @@ func waitForVMRunningState(ctx context.Context, s *Scenario, vmssVM *armcompute.
379379

380380
// waitForVMSSVM polls until a VMSS VM instance appears with network profile or the timeout elapses.
381381
func waitForVMSSVM(ctx context.Context, s *Scenario) (*armcompute.VirtualMachineScaleSetVM, error) {
382-
ctxTimeout, cancel := context.WithTimeout(ctx, time.Minute)
383-
defer cancel()
384-
385382
ticker := time.NewTicker(config.Config.DefaultPollInterval)
386383
defer ticker.Stop()
387384

@@ -392,7 +389,7 @@ func waitForVMSSVM(ctx context.Context, s *Scenario) (*armcompute.VirtualMachine
392389
})
393390

394391
if pager.More() {
395-
page, err := pager.NextPage(ctxTimeout)
392+
page, err := pager.NextPage(ctx)
396393
if err == nil && len(page.Value) > 0 {
397394
vmssVM := page.Value[0]
398395
// Verify it has network profile
@@ -406,7 +403,7 @@ func waitForVMSSVM(ctx context.Context, s *Scenario) (*armcompute.VirtualMachine
406403
}
407404

408405
select {
409-
case <-ctxTimeout.Done():
406+
case <-ctx.Done():
410407
if lastErr != nil {
411408
return nil, fmt.Errorf("timeout waiting for VMSS VM: %w", lastErr)
412409
}

0 commit comments

Comments
 (0)