remove akse linux and pass ossku to cluster create (#1658)

.pipelines/pipeline.yaml

@@ -285,20 +285,11 @@ stages:
   - template: singletenancy/aks-swift/e2e-job-template.yaml
     parameters:
       name: "aks_swift_e2e"
-      displayName: AKS Swift
+      displayName: AKS Swift Ubuntu
       pipelineBuildImage: "$(BUILD_IMAGE)"
       testDropgz: ""
       clusterName: "swifte2e"
-
-  - template: singletenancy/aks-engine/e2e-job-template.yaml
-    parameters:
-      name: "ubuntu_18_04_linux_e2e"
-      displayName: Ubuntu 18.04
-      pipelineBuildImage: "$(BUILD_IMAGE)"
-      clusterDefinition: "cniLinux1804.json"
-      clusterDefinitionCniTypeKey: "azureCNIURLLinux"
-      clusterDefinitionCniBuildOS: "linux"
-      clusterDefinitionCniBuildExt: ".tgz"
+      osSku: "Ubuntu"
 
   - template: singletenancy/aks-engine/e2e-job-template.yaml
     parameters:
@@ -320,25 +311,13 @@ stages:
       clusterDefinitionCniBuildOS: "windows"
       clusterDefinitionCniBuildExt: ".zip"
 
-  # - template: singletenancy/aks-engine/e2e-job-template.yaml
-  #   parameters:
-  #     name: "windows_20_22_e2e"
-  #     displayName: "Windows 2022"
-  #     pipelineBuildImage: "$(BUILD_IMAGE)"
-  #     clusterDefinition: "cniWindows2022.json"
-  #     clusterDefinitionCniTypeKey: "azureCNIURLWindows"
-  #     clusterDefinitionCniBuildOS: "windows"
-  #     clusterDefinitionCniBuildExt: ".zip"
-  
   - stage: cleanup
     displayName: Cleanup
     dependsOn:
       - "aks_swift_e2e"
       - "cilium_e2e"
-      - "ubuntu_18_04_linux_e2e"
       - "windows_19_03_e2e"
       - "windows_20_04_e2e"
-      # - "windows_20_22_e2e"
     jobs:
       - job: delete_remote_artifacts
         displayName: Delete remote artifacts

.pipelines/singletenancy/aks-swift/e2e-job-template.yaml

@@ -4,7 +4,7 @@ parameters:
   pipelineBuildImage: "$(BUILD_IMAGE)"
   testDropgz: ""
   clusterName: ""
-
+  osSku: ""
 stages:
   - stage: ${{ parameters.name }}
     displayName: E2E - ${{ parameters.displayName }}
@@ -30,3 +30,4 @@ stages:
               name: ${{ parameters.name }}
               testDropgz: ${{ parameters.testDropgz }}
               clusterName: ${{ parameters.clusterName }}
+              osSku: ${{ parameters.osSku }}

.pipelines/singletenancy/aks-swift/e2e-step-template.yaml

@@ -2,6 +2,7 @@ parameters:
   name: ""
   testDropgz: ""
   clusterName: ""
+  osSku: ""
 
 steps:
   - bash: |
@@ -32,7 +33,7 @@ steps:
         mkdir -p ~/.kube/
         echo "Create AKS cluster"
         make -C ./hack/swift azcfg AZCLI=az
-        make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision)
+        make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }}-$(make revision) OSSKU=${{ parameters.osSku }}
         echo "Cluster successfully created"
     displayName: Create test cluster
     condition: succeeded()

hack/swift/Makefile

@@ -9,6 +9,7 @@ AZCLI   ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v
 
 # overrideable variables
 USER       ?= $(whoami)
+OSSKU      ?= Ubuntu
 CLUSTER    ?= $(USER)-$(REGION)
 GROUP      ?= $(CLUSTER)
 REGION     ?= centraluseuap
@@ -94,6 +95,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster
 		--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
 		--generate-ssh-keys \
+		--os-sku $(OSSKU) \
 		--yes
 	@$(MAKE) set-kubeconf