ci: Updating k8s test suite for NPM to latest (#2707)

* test: latest k8s test suite

* ci: Update test suite

Author: jpayne3506

.pipelines/cni/pipeline.yaml

@@ -117,7 +117,7 @@ stages:
         displayName: "Build k8s NPM Linux Test Suite Binary"
         steps:
           - bash: |
-              git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=linux-long-sleep
+              git clone https://github.com/kubernetes/kubernetes.git --depth=1
               cd kubernetes
               export PATH=$PATH:/usr/local/go/bin/
               make WHAT=test/e2e/e2e.test
@@ -128,7 +128,7 @@ stages:
         displayName: "Build k8s NPM Windows Test Suite Binary"
         steps:
           - bash: |
-              git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=sleep-before-probing
+              git clone https://github.com/kubernetes/kubernetes.git --depth=1
               cd kubernetes
               export PATH=$PATH:/usr/local/go/bin/
               make WHAT=test/e2e/e2e.test
@@ -349,7 +349,7 @@ stages:
       vmSize: Standard_HC44-16rs
       arch: amd64
       cni: "cilium"
-  
+
   - template: cilium/cilium-overlay-load-test-template.yaml
     parameters:
       name: cilium_overlay_ds

.pipelines/npm/npm-cni-integration-test.yaml

@@ -120,7 +120,8 @@ jobs:
           --provider=local \
           --ginkgo.focus="$focus" \
           --ginkgo.skip="NetworkPolicyLegacy|SCTP" \
-          --kubeconfig=$HOME/.kube/config
+          --kubeconfig=$HOME/.kube/config \
+          --ginkgo.timeout="2h"
         displayName: "Run Kubernetes e2e.test"
         continueOnError: ${{ parameters.continueOnError }}
 

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

@@ -76,7 +76,7 @@ jobs:
       - checkout: self
 
       - bash: |
-          git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=linux-sleep-before-probing
+          git clone https://github.com/kubernetes/kubernetes.git --depth=1
           cd kubernetes
           export PATH=$PATH:/usr/local/go/bin/
           make WHAT=test/e2e/e2e.test
@@ -140,7 +140,7 @@ jobs:
           scriptLocation: "inlineScript"
           failOnStderr: true
           inlineScript: |
-            # get kubectl 
+            # get kubectl
             curl -LO https://dl.k8s.io/release/v1.23.0/bin/linux/amd64/kubectl
             chmod +x kubectl
             echo Cluster $(AZURE_CLUSTER)
@@ -204,7 +204,7 @@ jobs:
               ./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)
 
             else
-              echo "Creating Linux Cluster"; 
+              echo "Creating Linux Cluster";
               az aks create --no-ssh-key \
               --resource-group $(RESOURCE_GROUP) \
               --name $(AZURE_CLUSTER) \
@@ -261,7 +261,7 @@ jobs:
           }
 
           runConformanceWindows () {
-            git clone https://github.com/huntergregory/kubernetes.git
+            git clone https://github.com/kubernetes/kubernetes.git --depth=1
             cd kubernetes
             git checkout sleep-before-probing
             export PATH=$PATH:/usr/local/go/bin/
@@ -286,7 +286,7 @@ jobs:
               declare -a conformancePIDs
               for round in $(seq 1 $NUM_PARALLEL_JOBS_FOR_STRESS_TEST); do
                   # 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