@@ -89,6 +89,7 @@ type vmScenario struct {
8989 runPolicy v1alpha2.RunPolicy
9090 rootDiskSize string
9191 expectedAdditionalDisks int
92+ skipGuestAgentCheck bool
9293
9394 rootDisk * v1alpha2.VirtualDisk
9495 vm * v1alpha2.VirtualMachine
@@ -256,6 +257,7 @@ func newCurrentReleaseSmokeTest(f *framework.Framework, namespace string) *curre
256257 runPolicy : v1alpha2 .AlwaysOnUnlessStoppedManually ,
257258 rootDiskSize : defaultRootDiskSize ,
258259 expectedAdditionalDisks : 2 ,
260+ skipGuestAgentCheck : true ,
259261 },
260262 {
261263 name : "vm-alpine-iperf-server" ,
@@ -359,7 +361,7 @@ func (t *currentReleaseSmokeTest) createResources() {
359361func (t * currentReleaseSmokeTest ) verifyVMsReady () {
360362 By ("Waiting for guest agent and SSH access" )
361363 for _ , vmScenario := range t .vms {
362- t .expectGuestReady (vmScenario . vm )
364+ t .expectGuestReady (vmScenario )
363365 }
364366
365367 By ("Checking attached disks inside guests" )
@@ -374,7 +376,7 @@ func (t *currentReleaseSmokeTest) verifyVMsSurvivedUpgrade() {
374376
375377 By ("Checking guest access after module upgrade" )
376378 for _ , vmScenario := range t .vms {
377- t .expectGuestReady (vmScenario . vm )
379+ t .expectGuestReady (vmScenario )
378380 }
379381
380382 By ("Checking attached disks after module upgrade" )
@@ -493,12 +495,19 @@ func (t *currentReleaseSmokeTest) manualStartVMObjects() []crclient.Object {
493495 return objects
494496}
495497
496- func (t * currentReleaseSmokeTest ) expectGuestReady (vm * v1alpha2.VirtualMachine ) {
497- By (fmt .Sprintf ("Waiting for guest agent on %s" , vm .Name ))
498- util .UntilVMAgentReady (crclient .ObjectKeyFromObject (vm ), framework .LongTimeout )
498+ func (t * currentReleaseSmokeTest ) expectGuestReady (vmScenario * vmScenario ) {
499+ vm := vmScenario .vm
499500
500501 By (fmt .Sprintf ("Waiting for SSH access on %s" , vm .Name ))
501502 util .UntilSSHReady (t .framework , vm , framework .LongTimeout )
503+
504+ if vmScenario .skipGuestAgentCheck {
505+ By (fmt .Sprintf ("Skipping strict guest agent check on %s" , vm .Name ))
506+ return
507+ }
508+
509+ By (fmt .Sprintf ("Waiting for guest agent on %s" , vm .Name ))
510+ util .UntilVMAgentReady (crclient .ObjectKeyFromObject (vm ), framework .LongTimeout )
502511}
503512
504513func (t * currentReleaseSmokeTest ) expectAdditionalDiskCount (vm * v1alpha2.VirtualMachine , expectedCount int ) {
0 commit comments