ci: Add Windows2019 to CNI Release Test pipeline (#2580)

* ci: Add proc/os to windows

* chore: remove windows RDMA

* ci: add osSkuWin Defaults
This commit is contained in:
John Payne 2024-03-04 09:50:07 -08:00 коммит произвёл GitHub
Родитель d8de157af7
Коммит ef31188ea5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 45 добавлений и 7 удалений

Просмотреть файл

@ -5,6 +5,7 @@ parameters:
vmSize: ""
vmSizeWin: ""
osSKU: Ubuntu
osSkuWin: "Windows2022"
os: linux
nodeCountWin: 2
@ -23,7 +24,7 @@ steps:
CLUSTER=${{ parameters.clusterName }} NODE_COUNT=${{ parameters.nodeCount }} NODE_COUNT_WIN=${{ parameters.nodeCountWin }} \
VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} \
OS_SKU=${{parameters.osSKU}} OS=${{parameters.os}}
OS_SKU=${{ parameters.osSKU }} OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }}
echo "Cluster successfully created"
name: "CreateAksCluster"

Просмотреть файл

@ -39,6 +39,11 @@ stages:
arch: amd64
name: azure-ipam
os: linux
azure_ipam_windows2019_amd64:
arch: amd64
name: azure-ipam
os: windows
os_version: ltsc2019
azure_ipam_windows2022_amd64:
arch: amd64
name: azure-ipam
@ -48,6 +53,11 @@ stages:
arch: amd64
name: cni
os: linux
cni_windows2019_amd64:
arch: amd64
name: cni
os: windows
os_version: ltsc2019
cni_windows2022_amd64:
arch: amd64
name: cni
@ -142,7 +152,7 @@ stages:
platforms: linux/amd64 linux/arm64 windows/amd64
cni:
name: cni
os_versions: ltsc2022
os_versions: ltsc2019 ltsc2022
platforms: linux/amd64 linux/arm64 windows/amd64
npm:
name: npm
@ -165,9 +175,10 @@ stages:
nodeCountWin: ${NODE_COUNT_WIN}
vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
vmSizeWin: ${VM_SIZE_WIN}
arch: amd64
os: windows
os_version: 'ltsc2022'
arch: amd64
osSkuWin: 'Windows2022'
scaleup: ${SCALEUP_WIN}
iterations: ${ITERATIONS_WIN}
@ -175,7 +186,7 @@ stages:
parameters:
name: windows_podsubnet
clusterType: swift-byocni-up
clusterName: win-podsub
clusterName: w22-podsub
nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
nodeCountWin: ${NODE_COUNT_WIN}
vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
@ -183,6 +194,7 @@ stages:
arch: amd64
os: windows
os_version: 'ltsc2022'
osSkuWin: 'Windows2022'
scaleup: ${SCALEUP_WIN}
iterations: ${ITERATIONS_WIN}
@ -190,7 +202,7 @@ stages:
parameters:
name: windows_overlay
clusterType: overlay-byocni-up
clusterName: win-over
clusterName: w22-over
nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
nodeCountWin: ${NODE_COUNT_WIN}
vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
@ -198,6 +210,23 @@ stages:
arch: amd64
os: windows
os_version: 'ltsc2022'
osSkuWin: 'Windows2022'
scaleup: ${SCALEUP_WIN}
iterations: ${ITERATIONS_WIN}
- template: singletenancy/cniv2-template.yaml
parameters:
name: windows19_overlay
clusterType: overlay-byocni-up
clusterName: w19-amd-ov
nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
nodeCountWin: ${NODE_COUNT_WIN}
vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
vmSizeWin: ${VM_SIZE_WIN}
arch: amd64
os: windows
os_version: 'ltsc2019'
osSkuWin: 'Windows2019'
scaleup: ${SCALEUP_WIN}
iterations: ${ITERATIONS_WIN}
@ -336,6 +365,7 @@ stages:
- rdma_linux_overlay
- windows_podsubnet_HNS
- windows_overlay_HNS
- windows19_overlay_HNS
- setup
variables:
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
@ -384,10 +414,13 @@ stages:
clusterName: "rdma-over"
win-cniv2-podsubnet:
name: windows_podsubnet
clusterName: win-podsub
clusterName: w22-podsub
win-cniv2-overlay:
name: windows_overlay
clusterName: win-over
clusterName: w22-over
windows19_overlay:
name: windows19_overlay
clusterName: w19-amd-ov
steps:
- task: AzureCLI@1
inputs:

Просмотреть файл

@ -13,6 +13,7 @@ parameters:
iterations: 3
os_version: ""
osSKU: Ubuntu
osSkuWin: Windows2022
# CNIv1
# + Should be able to scale up/down the pods successfully certain number of times.
@ -81,6 +82,7 @@ stages:
region: $(LOCATION)
osSKU: ${{ parameters.osSKU }}
os: ${{ parameters.os }}
osSkuWin: ${{ parameters.osSkuWin }}
# Conditions for below E2E test scenarios confirm that:
# Pipeline has not been canceled and that the previous job has reports anything other than failure(Succeeded, SuccededWithIssues, Skipped). Previous job is declared by dependsOn:

Просмотреть файл

@ -11,6 +11,7 @@ parameters:
scaleup: 100
iterations: 3
osSKU: Ubuntu
osSkuWin: Windows2022
# CNIv2
# + Should be able to scale up/down the pods successfully certain number of times.
@ -77,6 +78,7 @@ stages:
region: $(LOCATION)
osSKU: ${{ parameters.osSKU }}
os: ${{ parameters.os }}
osSkuWin: ${{ parameters.osSkuWin }}
# Conditions for below E2E test scenarios confirm that:
# Pipeline has not been canceled and that the previous job has reports anything other than failure(Succeeded, SuccededWithIssues, Skipped). Previous job is declared by dependsOn: