ci: Update test suite

Azure · Apr 24, 2024 · f95d7c3 · f95d7c3
1 parent a255257
commit f95d7c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.pipelines/npm/npm-conformance-tests-latest-release.yaml b/.pipelines/npm/npm-conformance-tests-latest-release.yaml
@@ -113,7 +113,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)
@@ -177,7 +177,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:
               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

diff --git a/.pipelines/npm/npm-conformance-tests.yaml b/.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

diff --git a/test/capz/npm/npm-e2e.sh b/test/capz/npm/npm-e2e.sh
@@ -209,7 +209,7 @@ verify_vfp_tags_using_npm () {
 	echo "" > rehydration.failed
         return 1
     fi
-    
+
     echo "" > $ranFilename.ran
     if [[ $hadFailure == true ]]; then
         log "ERROR: VFP tags are inconsistent with HNS SetPolicies"
@@ -223,8 +223,8 @@ verify_vfp_tags_using_npm () {
 # results in a file called npm-hns-state.zip
 capture_npm_hns_state () {
     if [[ -f npm-hns-state.zip ]]; then
-        log "WARNING: not capturing NPM HNS state since state was previously captured"	
-        return 0	
+        log "WARNING: not capturing NPM HNS state since state was previously captured"
+        return 0
     fi
 
     log "capturing NPM HNS state..."
@@ -276,7 +276,7 @@ run_npm_conformance () {
     namedPorts="named port"
     wrongK8sVersion="Netpol API"
     toSkip="\[LinuxOnly\]|$nomatch1|$nomatch2|$nomatch3|$nomatch4|$cidrExcept1|$cidrExcept2|$namedPorts|$wrongK8sVersion|SCTP"
-    
+
     # to debug with one test case, uncomment this
     # toRun="NetworkPolicy API should support creating NetworkPolicy API operations"