ci: adds e2e test for containerd on windows

.pipelines/e2e-job-azure.yaml

@@ -17,6 +17,13 @@ jobs:
     parameters:
       clusterTypes:
       - "aks"
+      osTypes:
+      - "linux"
+      - "windows-docker"
+      - "windows-containerd"
+  - template: templates/e2e-test-azure.yaml
+    parameters:
+      clusterTypes:
       - "aks-engine"
       osTypes:
       - "linux"

.pipelines/templates/aks-engine-setup.yaml

@@ -21,7 +21,7 @@ steps:
     condition: and(succeeded(), eq(variables['CLUSTER_TYPE'], 'aks-engine'))
 
   - script: |
-      envsubst < test/e2e/cluster_configs/$(CLUSTER_CONFIG).json > cluster.json
+      envsubst < test/e2e/cluster_configs/$(OS_TYPE).json > cluster.json
     displayName: "Build AKS-Engine API Model"
     condition: and(succeeded(), eq(variables['CLUSTER_TYPE'], 'aks-engine'))
 

.pipelines/templates/aks-setup.yaml

@@ -5,6 +5,8 @@ parameters:
   - name: testWithGPU
     type: boolean
     default: false
+  - name: containerRuntime
+    type: string
 
 steps:
   - script: |
@@ -37,8 +39,8 @@ steps:
     condition: and(succeeded(), eq(variables['CLUSTER_TYPE'], 'aks'))
 
   - ${{ if eq(parameters.testClusterUpgrade, true) }}:
-    #Overrride AKS_INSTALL_VERSION if testing with k8s upgrade
-    #If we are running test with cluster upgrade, start with minimum possible non preview version. 
+    # Overrride AKS_INSTALL_VERSION if testing with k8s upgrade
+    # If we are running test with cluster upgrade, start with minimum possible non preview version. 
     - script: |
         aksVersion=$(az aks get-versions -l $(AZURE_LOCATION) --query "min(orchestrators[?isPreview==null].orchestratorVersion)" -otsv)
         echo "AKS Install version - $aksVersion"
@@ -74,13 +76,14 @@ steps:
         echo "##vso[task.setvariable variable=MASTERIP]${MASTERIP}"
         echo "##vso[task.setvariable variable=MASTERINTERNALIP]${MASTERIP}"
 
-      if [[ $CLUSTER_CONFIG == "windows" ]]; then
-        az aks nodepool add \
-            -g ${AZURE_CLUSTER_NAME} \
-            --cluster-name ${AZURE_CLUSTER_NAME} \
-            --os-type Windows \
-            --name win \
-            --node-count 1
+      if [[ "$(OS_TYPE)" == "windows" ]]; then
+        if [[ ${{ parameters.containerRuntime }} == "containerd" ]]; then
+          az extension add --name aks-preview
+          az extension update --name aks-preview
+          EXTRA_ARGS="--aks-custom-headers WindowsContainerRuntime=containerd"
+        fi
+
+        az aks nodepool add -g ${AZURE_CLUSTER_NAME} --cluster-name ${AZURE_CLUSTER_NAME} --os-type Windows --name win --node-count 1 ${EXTRA_ARGS:-} > /dev/null
       fi
 
       # store kubeconfig

.pipelines/templates/build-images.yaml

@@ -11,7 +11,7 @@ steps:
   - script: |
       # Generate image version
       if [[ -n "${CLUSTER_CONFIG:-}" ]]; then
-        IMAGE_VERSION="$(git describe --tags --always --dirty)-$(CLUSTER_TYPE)-$(CLUSTER_CONFIG)"
+        IMAGE_VERSION="$(git describe --tags --always --dirty)-$(CLUSTER_TYPE)-$(OS_TYPE)"
       else
         IMAGE_VERSION="$(git describe --tags --always --dirty)-$(CLUSTER_TYPE)-load"
       fi

.pipelines/templates/e2e-test-azure.yaml

@@ -31,6 +31,16 @@ jobs:
         - task: GoTool@0
           inputs:
             version: 1.16
+
+        - script: |
+            OS_TYPE=$(echo ${{ osType }} | cut -d '-' -f1 | tr -d '[:space:]')
+            echo "OS type - $OS_TYPE"
+            echo "##vso[task.setvariable variable=OS_TYPE]$OS_TYPE"
+
+            CONTAINER_RUNTIME=$(echo ${{ osType }} | cut -d '-' -f2 | tr -d '[:space:]')
+            echo "Container Runtime - $CONTAINER_RUNTIME"
+            echo "##vso[task.setvariable variable=CONTAINER_RUNTIME]$CONTAINER_RUNTIME"
+          displayName: 'Determine os type and container runtime'
 
         - script: |
             # Download kubectl
@@ -46,6 +56,7 @@ jobs:
             parameters:
               testClusterUpgrade: ${{ parameters.testClusterUpgrade }}
               testWithGPU: ${{ parameters.testWithGPU }}
+              containerRuntime: $(CONTAINER_RUNTIME)
 
         - ${{ if eq(clusterType, 'aks-engine') }}:
           - template: aks-engine-setup.yaml
@@ -58,7 +69,6 @@ jobs:
         - template: e2e-test.yaml
           parameters:
             testName: "Run e2e test with Released Version"
-            osType: ${{ osType }}
             testClusterUpgrade: ${{ parameters.testClusterUpgrade }}
             resetImageVersion: true
             isBackwardCompatibilityTest: true
@@ -68,7 +78,6 @@ jobs:
         - template: e2e-test.yaml
           parameters:
             testName: "Run e2e test with New Version"
-            osType: ${{ osType }}
             testClusterUpgrade: ${{ parameters.testClusterUpgrade }}
             isBackwardCompatibilityTest: true
             setRegistry: true
@@ -80,7 +89,6 @@ jobs:
           - template: e2e-test.yaml
             parameters:
               testName: "Run e2e test with New Version"
-              osType: ${{ osType }}
               testClusterUpgrade: ${{ parameters.testClusterUpgrade }}
               setRegistry: true
 
@@ -89,7 +97,6 @@ jobs:
           - template: e2e-test.yaml
             parameters:
               testName: "Run e2e test with New Version"
-              osType: ${{ osType }}
               testClusterUpgrade: ${{ parameters.testClusterUpgrade }}
               setRegistry: true
 

.pipelines/templates/e2e-test.yaml

@@ -1,8 +1,6 @@
 parameters:
   - name: testName
     type: string
-  - name: osType
-    type: string
   - name: testReleasedVersion
     type: boolean
     default: false    
@@ -21,6 +19,11 @@ parameters:
 
 steps:
   - script: |
+      # Set TEST_WiNDOWS=true to run the test on Windows
+      if [ "$(OS_TYPE)" == "windows" ] ; then
+        export TEST_WINDOWS=true
+      fi
+
       if [ "${{ parameters.setRegistry }}" == True ] ; then
         export REGISTRY="${REGISTRY:-$(REGISTRY_NAME).azurecr.io/k8s/csi/secrets-store}"
       fi
@@ -49,5 +52,3 @@ steps:
         CONFIG_IMAGE_VERSION: ""
       ${{ if parameters.isBackwardCompatibilityTest }}:
         IS_BACKWARD_COMPATIBILITY_TEST: ${{ parameters.isBackwardCompatibilityTest }}
-      ${{ if eq(parameters.osType, 'windows') }}:
-        TEST_WINDOWS: true