Skip to content

Commit d6dfe62

Browse files
committed
ci: all k8s versions
1 parent e0f9364 commit d6dfe62

File tree

2 files changed

+72
-139
lines changed

2 files changed

+72
-139
lines changed

.pipelines/cni/ado-automation/var-pipeline.yaml

Lines changed: 69 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@ trigger: none
44
variables:
55
- group: ACN-CNI-Pipeline
66

7+
parameters:
8+
- name: versions
9+
displayName: K8s Versions
10+
type: object
11+
default:
12+
- ver: '27'
13+
lts: "true"
14+
- ver: '28'
15+
lts: true
16+
- ver: '29'
17+
lts: '''true'''
18+
- ver: '30'
19+
LTS: '''false'''
20+
- ver: '31'
21+
LTS: "false"
22+
- ver: '32'
23+
LTS: false
24+
# - ver: '33'
25+
# LTS: 'false'
26+
727
stages:
828
- stage: setup
929
displayName: Variable Group Init
@@ -59,84 +79,34 @@ stages:
5979
variables:
6080
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
6181
jobs:
62-
- job: cluster31
63-
displayName: 1.31 Cluster Creation
64-
pool:
65-
name: "$(BUILD_POOL_NAME_DEFAULT)"
66-
strategy:
67-
matrix:
68-
cniv1:
69-
clusterType: cniv1-up
70-
clusterName: cniv1
71-
cilium:
72-
clusterType: overlay-cilium-up
73-
clusterName: cilium
74-
overlay:
75-
clusterType: overlay-up
76-
clusterName: overlay
77-
steps:
78-
- template: ../../templates/create-cluster-steps.yaml
79-
parameters:
80-
clusterType: $(clusterType)
81-
clusterName: $(clusterName)-31-$(commitID)
82-
k8sVersion: 1.31
83-
vmSize: Standard_B2ms
84-
vmSizeWin: Standard_B2ms
85-
os: windows
86-
region: $(REGION_AKS_CLUSTER_TEST)
87-
LTS: false
88-
- job: cluster29
89-
displayName: 1.29 Cluster Creation
90-
pool:
91-
name: "$(BUILD_POOL_NAME_DEFAULT)"
92-
strategy:
93-
matrix:
94-
cniv1:
95-
clusterType: cniv1-up
96-
clusterName: cniv1
97-
cilium:
98-
clusterType: overlay-cilium-up
99-
clusterName: cilium
100-
overlay:
101-
clusterType: overlay-up
102-
clusterName: overlay
103-
steps:
104-
- template: ../../templates/create-cluster-steps.yaml
105-
parameters:
106-
clusterType: $(clusterType)
107-
clusterName: $(clusterName)-29-$(commitID)
108-
k8sVersion: 1.29
109-
vmSize: Standard_B2ms
110-
vmSizeWin: Standard_B2ms
111-
os: windows
112-
region: $(REGION_AKS_CLUSTER_TEST)
113-
LTS: true
114-
- job: cluster27
115-
displayName: 1.27 Cluster Creation
116-
pool:
117-
name: "$(BUILD_POOL_NAME_DEFAULT)"
118-
strategy:
119-
matrix:
120-
cniv1:
121-
clusterType: cniv1-up
122-
clusterName: cniv1
123-
cilium:
124-
clusterType: overlay-cilium-up
125-
clusterName: cilium
126-
overlay:
127-
clusterType: overlay-up
128-
clusterName: overlay
129-
steps:
130-
- template: ../../templates/create-cluster-steps.yaml
131-
parameters:
132-
clusterType: $(clusterType)
133-
clusterName: $(clusterName)-27-$(commitID)
134-
k8sVersion: 1.27
135-
vmSize: Standard_B2ms
136-
vmSizeWin: Standard_B2ms
137-
os: windows
138-
region: $(REGION_AKS_CLUSTER_TEST)
139-
LTS: true
82+
- ${{ each version in parameters.versions }}:
83+
- job: cluster${{ version.ver }}
84+
displayName: 1.${{ version.ver }} Cluster Creation
85+
pool:
86+
name: "$(BUILD_POOL_NAME_DEFAULT)"
87+
strategy:
88+
matrix:
89+
cniv1:
90+
clusterType: cniv1-up
91+
clusterName: cniv1
92+
cilium:
93+
clusterType: overlay-cilium-up
94+
clusterName: cilium
95+
overlay:
96+
clusterType: overlay-up
97+
clusterName: overlay
98+
steps:
99+
- template: ../../templates/create-cluster-steps.yaml
100+
parameters:
101+
clusterType: $(clusterType)
102+
clusterName: $(clusterName)-${{ version.ver }}-$(commitID)
103+
k8sVersion: 1.${{ version.ver }}
104+
vmSize: Standard_B2ms
105+
vmSizeWin: Standard_B2ms
106+
os: windows
107+
region: $(REGION_AKS_CLUSTER_TEST)
108+
LTS: ${{ version.lts }}
109+
140110

141111
- stage: clusterDelete
142112
displayName: "Cluster Delete"
@@ -147,65 +117,26 @@ stages:
147117
variables:
148118
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
149119
jobs:
150-
- job: cluster31
151-
displayName: 1.31 Cluster Delete
152-
pool:
153-
name: "$(BUILD_POOL_NAME_DEFAULT)"
154-
strategy:
155-
matrix:
156-
cniv1:
157-
clusterName: cniv1
158-
cilium:
159-
clusterName: cilium
160-
overlay:
161-
clusterName: overlay
162-
steps:
163-
- template: ../../templates/delete-cluster.yaml
164-
parameters:
165-
name: $(clusterName)-31-$(commitID)
166-
clusterName: $(clusterName)-31-$(commitID)
167-
region: $(REGION_AKS_CLUSTER_TEST)
168-
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
169-
svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
170-
- job: cluster29
171-
displayName: 1.29 Cluster Delete
172-
pool:
173-
name: "$(BUILD_POOL_NAME_DEFAULT)"
174-
strategy:
175-
matrix:
176-
cniv1:
177-
clusterName: cniv1
178-
cilium:
179-
clusterName: cilium
180-
overlay:
181-
clusterName: overlay
182-
steps:
183-
- template: ../../templates/delete-cluster.yaml
184-
parameters:
185-
name: $(clusterName)-29-$(commitID)
186-
clusterName: $(clusterName)-29-$(commitID)
187-
region: $(REGION_AKS_CLUSTER_TEST)
188-
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
189-
svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
190-
- job: cluster27
191-
displayName: 1.27 Cluster Delete
192-
pool:
193-
name: "$(BUILD_POOL_NAME_DEFAULT)"
194-
strategy:
195-
matrix:
196-
cniv1:
197-
clusterName: cniv1
198-
cilium:
199-
clusterName: cilium
200-
overlay:
201-
clusterName: overlay
202-
steps:
203-
- template: ../../templates/delete-cluster.yaml
204-
parameters:
205-
name: $(clusterName)-27-$(commitID)
206-
clusterName: $(clusterName)-27-$(commitID)
207-
region: $(REGION_AKS_CLUSTER_TEST)
208-
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
209-
svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
120+
- ${{ each version in parameters.versions }}:
121+
- job: cluster${{ version.ver }}
122+
displayName: 1.${{ version.ver }} Cluster Delete
123+
pool:
124+
name: "$(BUILD_POOL_NAME_DEFAULT)"
125+
strategy:
126+
matrix:
127+
cniv1:
128+
clusterName: cniv1
129+
cilium:
130+
clusterName: cilium
131+
overlay:
132+
clusterName: overlay
133+
steps:
134+
- template: ../../templates/delete-cluster.yaml
135+
parameters:
136+
name: $(clusterName)-${{ version.ver }}-$(commitID)
137+
clusterName: $(clusterName)-${{ version.ver }}-$(commitID)
138+
region: $(REGION_AKS_CLUSTER_TEST)
139+
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
140+
svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
210141

211142

.pipelines/templates/create-cluster-steps.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ steps:
2222
inlineScript: |
2323
set -e
2424
echo "Check az version"
25+
echo "Para check parameter | ${{ lower(parameters.LTS) }}"
26+
echo " Para check parameter | ${{ parameters.k8sVersion }}"
2527
az version
2628
if ${{ lower(contains(parameters.clusterType, 'dualstack')) }}
2729
then
@@ -48,7 +50,7 @@ steps:
4850
CLUSTER=${{ parameters.clusterName }} \
4951
VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
5052
OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }} \
51-
LTS=${{ parameters.LTS }}
53+
LTS=${{ lower(parameters.LTS) }}
5254
5355
echo "Cluster successfully created"
5456
displayName: Cluster - ${{ parameters.clusterType }}

0 commit comments

Comments
 (0)