diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index cd2b2d2300..ab0f272d93 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -29,22 +29,22 @@ steps: echo Using AKS-Engine version $aksEVersion #download source - wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.4.tar.gz + wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.5.tar.gz # extract source #tar -zxf $aksEVersion.tar.gz - tar -zxf v1.0.4.tar.gz + tar -zxf v1.0.5.tar.gz # move source to current directory mv aks-engine-*/* . # download binary - wget https://github.com/jaer-tsun/aks-engine/releases/download/v1.0.4/aks-engine-v1.0.4-linux-amd64.tar.gz + wget https://github.com/jaer-tsun/aks-engine/releases/download/v1.0.5/aks-engine-v1.0.5-linux-amd64.tar.gz rm -rf ./bin mkdir ./bin # extract binary - tar -zxvf aks-engine-v1.0.4-linux-amd64.tar.gz -C bin + tar -zxvf aks-engine-v1.0.5-linux-amd64.tar.gz -C bin mv ./bin/aks-engine-*/* ./bin/ ls -l ./bin ./bin/aks-engine version @@ -110,6 +110,9 @@ steps: export IS_JENKINS=false export DEBUG_CRASHING_PODS=true export AZURE_CORE_ONLY_SHOW_ERRORS=True + RGNAME="kubernetes"$RANDOM + export RESOURCE_GROUP=$RGNAME + echo "##vso[task.setvariable variable=RESOURCE_GROUP]$RESOURCE_GROUP" echo Cluster Def $CLUSTER_DEFINITION cat $CLUSTER_DEFINITION make test-kubernetes @@ -128,3 +131,14 @@ steps: artifactName: ${{ parameters.name }} pathtoPublish: "$(Build.ArtifactStagingDirectory)/${{ parameters.name }}" condition: always() + + - task: AzureCLI@2 + displayName: "Delete Test Cluster Resource Group" + condition: always() + inputs: + azureSubscription: $(AKS_ENGINE_SERVICE_CONNECTION) + scriptType: 'bash' + scriptLocation: 'inlineScript' + inlineScript: | + echo "Deleting: $(RESOURCE_GROUP)" + az group delete -n $(RESOURCE_GROUP) --yes \ No newline at end of file