ci: update lsg connectivity/cli

Author: jpayne3506

.pipelines/cni/lsg/lsg-cni-intergration-template.yaml

@@ -187,24 +187,25 @@ stages:
         dependsOn: recover
         condition: and( succeeded(), ${{ contains(parameters.cni, 'cilium') }} )
         steps:
-          - script: |
-              echo "install cilium CLI"
-              if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
-                echo "Cilium Agent Version ${BASH_REMATCH[0]}"
-                CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
-              else
-                echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
-                CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
-              fi
-              CLI_ARCH=amd64
-              curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
-              sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
-              sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
-              rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
-              cilium status
-              cilium version
-            name: "InstallCiliumCli"
-            displayName: "Install Cilium CLI"
+          # - script: |
+          #     echo "install cilium CLI"
+          #     if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
+          #       echo "Cilium Agent Version ${BASH_REMATCH[0]}"
+          #       CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
+          #     else
+          #       echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
+          #       CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
+          #     fi
+          #     CLI_ARCH=amd64
+          #     curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
+          #     sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
+          #     sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
+          #     rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
+          #     cilium status
+          #     cilium version
+          #   name: "InstallCiliumCli"
+          #   displayName: "Install Cilium CLI"
+          - template: ../../templates/cilium-cli.yaml
           - task: AzureCLI@2
             inputs:
               azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -216,12 +217,7 @@ stages:
                 make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
             name: "GetCluster"
             displayName: "Get AKS Cluster"
-          - script: |
-              kubectl delete ns load-test
-              cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
-            retryCountOnTaskFailure: 6
-            name: "CiliumConnectivityTests"
-            displayName: "Run Cilium Connectivity Tests"
+          - template: ../../templates/cilium-connectivity-tests.yaml
       - ${{ if contains(parameters.cni, 'cilium') }}:
         - template: ../k8s-e2e/k8s-e2e-job-template.yaml
           parameters:

.pipelines/templates/cilium-connectivity-tests.yaml

@@ -0,0 +1,13 @@
+parameters:
+  skipTests: '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops,!to-fqdns'
+
+steps:
+  - script: |
+      if ! cilium connectivity test --connect-timeout 4s --request-timeout 30s --test ${{ parameters.skipTests }} --force-deploy
+      then
+        echo "--- Connectivity Tests failed! ---"
+        echo "--- Running Connectivity Tests with --debug ---"
+        cilium connectivity test --debug --connect-timeout 4s --request-timeout 30s --test ${{ parameters.skipTests }} --force-deploy
+      fi
+    name: "CiliumConnectivityTests"
+    displayName: "Run Cilium Connectivity Tests"