Skip to content

ci: update e2e apimodel to 2004 #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2021
Merged

ci: update e2e apimodel to 2004 #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390d7bd
chore: update apimodel to 2004
matmerr Oct 20, 2021
c1ccce0
2004
matmerr Oct 21, 2021
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
22 changes: 12 additions & 10 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,6 @@ stages:
displayName: AKS Swift
pipelineBuildImage: "$(BUILD_IMAGE)"

- template: singletenancy/aks-engine/e2e-job-template.yaml
parameters:
name: "ubuntu_16_04_linux_e2e"
displayName: Ubuntu 16.04
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1604.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"

- template: singletenancy/aks-engine/e2e-job-template.yaml
parameters:
Expand All @@ -236,13 +227,24 @@ stages:
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"


- template: singletenancy/aks-engine/e2e-job-template.yaml
parameters:
name: "windows_20_04_e2e"
displayName: "Windows 2004"
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniWindows2004.json"
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"

- stage: cleanup
displayName: Cleanup
dependsOn:
- "aks_swift_e2e"
- "ubuntu_16_04_linux_e2e"
- "ubuntu_18_04_linux_e2e"
- "windows_19_03_e2e"
- "windows_20_04_e2e"
jobs:
- job: delete_remote_artifacts
displayName: Delete remote artifacts
Expand Down
60 changes: 0 additions & 60 deletions test/apimodels/cniLinux1604.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions test/apimodels/cniLinux1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.17",
"orchestratorRelease": "1.22",
"kubernetesConfig": {
"networkPlugin": "azure",
"networkPolicy": "azure",
Expand Down Expand Up @@ -57,4 +57,4 @@
"secret": ""
}
}
}
}
6 changes: 3 additions & 3 deletions test/apimodels/cniWindows1809.json → test/apimodels/cniWindows2004.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"enableAutomaticUpdates": false,
"sshEnabled": true,
"windowsPublisher": "MicrosoftWindowsServer",
"windowsOffer": "WindowsServerSemiAnnual",
"windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk",
"windowsOffer": "WindowsServer",
"windowsSku": "datacenter-core-2004-with-containers-smalldisk",
"imageVersion": "latest"
},
"linuxProfile": {
Expand All @@ -58,4 +58,4 @@
"secret": ""
}
}
}
}