Skip to content

Commit e0f9364

Browse files
committed
fixup: put in delete commit
1 parent fba5d08 commit e0f9364

File tree

2 files changed

+94
-1
lines changed

2 files changed

+94
-1
lines changed

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

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,32 @@ stages:
5959
variables:
6060
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
6161
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
6288
- job: cluster29
6389
displayName: 1.29 Cluster Creation
6490
pool:
@@ -85,6 +111,32 @@ stages:
85111
os: windows
86112
region: $(REGION_AKS_CLUSTER_TEST)
87113
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
88140

89141
- stage: clusterDelete
90142
displayName: "Cluster Delete"
@@ -95,6 +147,26 @@ stages:
95147
variables:
96148
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
97149
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)
98170
- job: cluster29
99171
displayName: 1.29 Cluster Delete
100172
pool:
@@ -115,4 +187,25 @@ stages:
115187
region: $(REGION_AKS_CLUSTER_TEST)
116188
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
117189
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)
210+
118211

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ steps:
4848
CLUSTER=${{ parameters.clusterName }} \
4949
VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
5050
OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }} \
51-
LTS=${{ parameters.os }}
51+
LTS=${{ parameters.LTS }}
5252
5353
echo "Cluster successfully created"
5454
displayName: Cluster - ${{ parameters.clusterType }}

0 commit comments

Comments
 (0)