Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions .pipelines/singletenancy/aks-engine/e2e-step-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,23 @@ steps:
echo Using AKS-Engine version $aksEVersion

#download source
wget https://github.com/jaer-tsun/aks-engine/archive/v1.0.5.tar.gz
wget https://github.com/csfmomo/aks-engine/archive/v1.0.6.tar.gz

# extract source
#tar -zxf $aksEVersion.tar.gz
tar -zxf v1.0.5.tar.gz
tar -zxf v1.0.6.tar.gz

# move source to current directory
mv aks-engine-*/* .

# download binary
wget https://github.com/jaer-tsun/aks-engine/releases/download/v1.0.5/aks-engine-v1.0.5-linux-amd64.tar.gz
wget https://github.com/csfmomo/aks-engine/releases/download/v1.0.6/aks-engine-v1.0.6-linux-amd64.tar.gz

rm -rf ./bin
mkdir ./bin

# extract binary
tar -zxvf aks-engine-v1.0.5-linux-amd64.tar.gz -C bin
tar -zxvf aks-engine-v1.0.6-linux-amd64.tar.gz -C bin
mv ./bin/aks-engine-*/* ./bin/
ls -l ./bin
./bin/aks-engine version
Expand Down Expand Up @@ -132,14 +133,3 @@ 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
2 changes: 1 addition & 1 deletion test/apimodels/cniLinux1804.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.22",
"orchestratorVersion": "1.22.7",
"orchestratorVersion": "1.22.15",
"kubernetesConfig": {
"networkPlugin": "azure",
"networkPolicy": "azure",
Expand Down
2 changes: 1 addition & 1 deletion test/apimodels/cniWindows1903.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.22",
"orchestratorVersion": "1.22.7",
"orchestratorVersion": "1.22.15",
"kubernetesConfig": {
"networkPlugin": "azure",
"networkPolicy": "azure",
Expand Down
2 changes: 1 addition & 1 deletion test/apimodels/cniWindows2004.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.22",
"orchestratorVersion": "1.22.7",
"orchestratorVersion": "1.22.15",
"kubernetesConfig": {
"networkPlugin": "azure",
"networkPolicy": "azure",
Expand Down
2 changes: 1 addition & 1 deletion test/apimodels/cniWindows2022.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.22",
"orchestratorVersion": "1.22.7",
"orchestratorVersion": "1.22.15",
"kubernetesConfig": {
"networkPlugin": "azure",
"networkPolicy": "azure",
Expand Down