removing windows conformance tests part 2

Author: rayaisaiah

.pipelines/npm/npm-conformance-tests.yaml

@@ -266,46 +266,6 @@ stages:
                 # there can't be a command after e2e.test/policy-assistant because the exit code is important
             }
 
-            runConformanceWindows () {
-              # full suite of ~32 test cases is taking too long...
-              # nomatch1="should enforce policy based on PodSelector or NamespaceSelector"
-              # nomatch2="should enforce policy based on NamespaceSelector with MatchExpressions using default ns label"
-              # nomatch3="should enforce policy based on PodSelector and NamespaceSelector"
-              # nomatch4="should enforce policy based on Multiple PodSelectors and NamespaceSelectors"
-              # cidrExcept1="should ensure an IP overlapping both IPBlock.CIDR and IPBlock.Except is allowed"
-              # cidrExcept2="should enforce except clause while egress access to server in CIDR block"
-              # namedPorts="named port"
-              # wrongK8sVersion="Netpol API"
-              # toSkip="\[LinuxOnly\]|$nomatch1|$nomatch2|$nomatch3|$nomatch4|$cidrExcept1|$cidrExcept2|$namedPorts|$wrongK8sVersion|SCTP"
-
-              # slimmed down to 14 tests like npm-cni-integration-test.yaml
-              # NetworkPolicy between server and...
-              f1="client should enforce policy to allow traffic only from a different namespace, based on NamespaceSelector"
-              f2="client should deny egress from pods based on PodSelector"
-              f3="client should enforce multiple, stacked policies with overlapping podSelectors"
-              f4="client should enforce egress policy allowing traffic to a server in a different namespace based on PodSelector and NamespaceSelector"
-              f5="client should work with Ingress, Egress specified together"
-              f6="client should enforce ingress policy allowing any port traffic to a server on a specific protocol"
-              f7="client should not allow access by TCP when a policy specifies only UDP"
-              f8="client should allow egress access to server in CIDR block"
-              f9="client should enforce policy based on Ports"
-              f10="client should support allow-all policy"
-              f11="client should enforce updated policy"
-              f12="client should support denying of egress traffic on the client side"
-              f13="client should stop enforcing policies after they are deleted"
-              f14="client should support a 'default-deny-ingress' policy"
-              focus="$f1|$f2|$f3|$f4|$f5|$f6|$f7|$f8|$f9|$f10|$f11|$f12|$f13|$f14"
-              KUBERNETES_SERVICE_HOST="$FQDN" KUBERNETES_SERVICE_PORT=443 \
-                ./e2e.test \
-                --provider=local \
-                --ginkgo.focus="$focus" \
-                --ginkgo.skip="\[LinuxOnly\]|NetworkPolicyLegacy|SCTP" \
-                --node-os-distro=windows \
-                --allowed-not-ready-nodes=1 \
-                --kubeconfig=./kubeconfig \
-                --ginkgo.timeout="2h"
-            }
-
             exitCode=0
             if [ $(IS_STRESS_TEST) == "true" ]; then
                 echo "Running $NUM_PARALLEL_JOBS_FOR_STRESS_TEST conformance tests at once and writing outputs to files"
@@ -314,20 +274,11 @@ stages:
                     # for each iteration, run the conformance test and echos in the background, and write the output of the conformance test to a file
 
                     # run the conformance test in the foreground and write the output to stdout and a file
-                    if [[ $(AZURE_CLUSTER) == *ws22 ]] # * is used for pattern matching
-                    then
-                      echo "starting conformance test #$round" && \
-                          runConformanceWindows | tee $npmLogsFolder/conformance-results-$round && \
-                          echo "finished conformance test #$round" &
-                      pidOfConformanceTest=$!
-                      conformancePIDs+=($pidOfConformanceTest)
-                    else
-                      echo "starting windows conformance test #$round" && \
-                          runConformance > $npmLogsFolder/conformance-results-$round && \
-                          echo "finished conformance test #$round" &
-                      pidOfConformanceTest=$!
-                      conformancePIDs+=($pidOfConformanceTest)
-                    fi
+                    echo "starting windows conformance test #$round" && \
+                        runConformance > $npmLogsFolder/conformance-results-$round && \
+                        echo "finished conformance test #$round" &
+                    pidOfConformanceTest=$!
+                    conformancePIDs+=($pidOfConformanceTest)
                 done
 
                 # wait until all conformance tests finish and take note of any failed tests
@@ -341,15 +292,9 @@ stages:
                     fi
                 done
             else
-                # run the conformance test in the foreground and write the output to stdout and a file
-              if [[ $(AZURE_CLUSTER) == *ws22 ]] # * is used for pattern matching
-              then
-                runConformanceWindows | tee $npmLogsFolder/conformance-results
-                exitCode=$?
-              else
-                runConformance | tee $npmLogsFolder/conformance-results
-                exitCode=$?
-              fi
+              # run the conformance test in the foreground and write the output to stdout and a file
+              runConformance | tee $npmLogsFolder/conformance-results
+              exitCode=$?
             fi
 
             # get all current npm pods