@@ -621,7 +621,6 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
621
621
os .Setenv ("KUBECONFIG" , kubeconfig )
622
622
623
623
artifactsDir , ok := os .LookupEnv ("ARTIFACTS" )
624
- reportArg := ""
625
624
kubetestDumpDir := ""
626
625
if ok {
627
626
if len (reportPrefix ) > 0 {
@@ -634,13 +633,14 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
634
633
}
635
634
}
636
635
ginkgoArgs := fmt .Sprintf ("--ginkgo.focus=%s --ginkgo.skip=%s" , testParams .testFocus , testParams .testSkip )
636
+
637
+ windowsArgs := ""
637
638
if testParams .platform == "windows" {
638
- ginkgoArgs = ginkgoArgs + fmt .Sprintf (" --node-os-distro=%s --allowed-not-ready-nodes=%d" , testParams .platform , testParams .allowedNotReadyNodes )
639
+ windowsArgs = fmt .Sprintf (" --node-os-distro=%s --allowed-not-ready-nodes=%d" , testParams .platform , testParams .allowedNotReadyNodes )
639
640
}
640
- testArgs := fmt .Sprintf ("%s %s %s" ,
641
- ginkgoArgs ,
642
- testConfigArg ,
643
- reportArg )
641
+ ginkgoArgs = ginkgoArgs + windowsArgs
642
+
643
+ testArgs := fmt .Sprintf ("%s %s" , ginkgoArgs , testConfigArg )
644
644
645
645
kubeTestArgs := []string {
646
646
"--test" ,
@@ -665,7 +665,7 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
665
665
kubeTest2Args = append (kubeTest2Args , fmt .Sprintf ("--skip-regex=%s" , testParams .testSkip ))
666
666
// kubetest uses 25 as default value for ginkgo parallelism (--nodes).
667
667
kubeTest2Args = append (kubeTest2Args , "--parallel=25" )
668
- kubeTest2Args = append (kubeTest2Args , fmt .Sprintf ("--test-args=%s %s" , testConfigArg , reportArg ))
668
+ kubeTest2Args = append (kubeTest2Args , fmt .Sprintf ("--test-args=%s %s" , testConfigArg , windowsArgs ))
669
669
670
670
if kubetestDumpDir != "" {
671
671
kubeTestArgs = append (kubeTestArgs , fmt .Sprintf ("--dump=%s" , kubetestDumpDir ))
0 commit comments